[patch] allegro.spec

Kiesiu kiesyoo at o2.pl
Fri Jul 29 16:44:02 CEST 2005 

W załącznikach patche na spec i wykorzystywane łatki. Dobrze by było,
jakby ktoś przejrzał to i ewentualnie jeśli były by jakieś błędy dał
znać co mam poprawić. A jeśli wszystko OK, to commitnąć to. Z góry dzięki.

allegro.spec:
- updated to 4.2.0-beta4
- removed obsolete alsa, am18 and asm patches, updated examples, opt and
frame-pointer patches
- fixed BuildRequires for arts and jack
- fixed descriptions

allegro-examples.patch
- updated to 4.2.0-beta4

allegro-opt.patch
- updated to 4.2.0-beta4

allegro-frame-pointer.patch
- updated to 4.2.0-beta4


pozdrawiam,
Łukasz Kieś
-------------- next part --------------
--- allegro.spec.orig	2005-07-24 13:31:56.000000000 +0200
+++ allegro.spec	2005-07-29 15:36:46.000000000 +0200
@@ -16,28 +16,32 @@
 Summary(it):	Una libreria per la programmazione di videogiochi
 Summary(pl):	Biblioteka do programowania gier
 Name:		allegro
-Version:	4.1.18
-Release:	1
+Version:	4.2.0
+%define		_beta	beta4
+Release:	0.%{_beta}.1
 License:	Giftware
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/alleg/%{name}-%{version}.tar.gz
-# Source0-md5:	215b84351f349f5998a77f99bf1218fa
+Source0:	http://dl.sourceforge.net/alleg/%{name}-%{version}-%{_beta}.tar.gz
+# Source0-md5:	65c2ee9caab79ea3616458a911a1b855
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-examples.patch
 Patch2:		%{name}-opt.patch
 Patch3:		%{name}-ldflags.patch
 Patch4:		%{name}-frame-pointer.patch
-Patch5:		%{name}-alsa-1_0.patch
-Patch6:		%{name}-am18.patch
-Patch7:		%{name}-asm.patch
 URL:		http://alleg.sourceforge.net/
-BuildRequires:	XFree86-devel
+BuildRequires:	X11-devel
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
-%{?with_arts:BuildRequires:	arts-devel}
+%if %{with_arts}
+BuildRequires:	arts-devel
+BuildRequires:	artsc-devel
+%endif
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	esound-devel
-%{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
+%if %{with_jack}
+BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:	pkgconfig
+%endif
 %{?with_svga:BuildRequires:	svgalib-devel}
 BuildRequires:	texinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,12 +59,12 @@
 programación de juegos u otro tipo de programación multimedia.
 
 %description -l fr
-Allegro est une librairie multi-plateforme destinée ŕ ętre utilisée dans
-les jeux vidéo ou d'autres types de programmation multimédia.
+Allegro est une librairie multi-plateforme destinée ŕ ętre utilisée
+dans les jeux vidéo ou d'autres types de programmation multimédia.
 
 %description -l it
-Allegro č una libreria multipiattaforma dedicata all'uso nei videogiochi
-ed in altri tipi di programmazione multimediale.
+Allegro č una libreria multipiattaforma dedicata all'uso nei
+videogiochi ed in altri tipi di programmazione multimediale.
 
 %description -l pl
 Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w
@@ -92,14 +96,14 @@
 paquete es necesario para compilar los programas que usen Allegro.
 
 %description devel -l fr
-Allegro est une librairie multi-plateforme destinée ŕ ętre utilisée dans
-les jeux vidéo ou d'autres types de programmation multimédia. Ce package
-est nécessaire pour compiler les programmes utilisant Allegro.
+Allegro est une librairie multi-plateforme destinée ŕ ętre utilisée
+dans les jeux vidéo ou d'autres types de programmation multimédia. Ce
+package est nécessaire pour compiler les programmes utilisant Allegro.
 
 %description devel -l it
-Allegro č una libreria multipiattaforma dedicata all'uso nei videogiochi
-ed in altri tipi di programmazione multimediale. Questo pacchetto č
-necessario per compilare programmi scritti con Allegro.
+Allegro č una libreria multipiattaforma dedicata all'uso nei
+videogiochi ed in altri tipi di programmazione multimediale. Questo
+pacchetto č necessario per compilare programmi scritti con Allegro.
 
 %description devel -l pl
 Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w
@@ -177,7 +181,7 @@
 %description profile-static
 liballp - profiling version of static allegro library.
 
-%description debug-static -l pl
+%description profile-static -l pl
 liballp - wersja statycznej biblioteki allegro służąca do
 profilowania.
 
@@ -321,12 +325,11 @@
 
 This package contains module for use with JACK sound library.
 
-%description alsa -l pl
+%description jack -l pl
 Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w
 grach komputerowych i innych rodzajach oprogramowania multimedialnego.
 
-Ten pakiet zawiera moduł do wykorzystania z biblioteką dźwiękową
-JACK.
+Ten pakiet zawiera moduł do wykorzystania z biblioteką dźwiękową JACK.
 
 %package tools
 Summary:	A game programming library - tools
@@ -347,8 +350,8 @@
 %description tools -l de
 Allegro ist eine plattformübergreifende Bibliothek zur Verwendung in
 Computerspielen und anderen Formen von Multinediaprogrammierung.
-Dieses Paket enthält Programme, die für die Entwicklung von
-Allegro Programmen hilfreich sind.
+Dieses Paket enthält Programme, die für die Entwicklung von Allegro
+Programmen hilfreich sind.
 
 %description tools -l es
 Allegro es una librería multi-plataforma creada para ser usada en la
@@ -357,16 +360,16 @@
 desarrollar programas que usen Allegro.
 
 %description tools -l fr
-Allegro est une librairie multi-plateforme destinée ŕ ętre utilisée dans
-les jeux vidéo ou d'autres types de programmation multimédia. Ce package
-contient des outils supplémentaires qui sont utiles pour le développement
-de programmes avec Allegro.
+Allegro est une librairie multi-plateforme destinée ŕ ętre utilisée
+dans les jeux vidéo ou d'autres types de programmation multimédia. Ce
+package contient des outils supplémentaires qui sont utiles pour le
+développement de programmes avec Allegro.
 
 %description tools -l it
-Allegro č una libreria multipiattaforma dedicata all'uso nei videogiochi
-ed in altri tipi di programmazione multimediale. Questo pacchetto
-contiene programmi di utilitŕ aggiuntivi utili allo sviluppo di programmi
-con Allegro.
+Allegro č una libreria multipiattaforma dedicata all'uso nei
+videogiochi ed in altri tipi di programmazione multimediale. Questo
+pacchetto contiene programmi di utilitŕ aggiuntivi utili allo sviluppo
+di programmi con Allegro.
 
 %description tools -l pl
 Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w
@@ -407,9 +410,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 %{__aclocal}
@@ -423,6 +423,9 @@
 	%{?with_dbglib:--enable-dbglib} \
 	%{?with_proflib:--enable-proflib} \
 	%{!?with_arts:--disable-artsdigi} \
+	%{!?with_alsa:--disable-alsadigi} \
+	%{!?with_alsa:--disable-alsamidi} \
+	%{!?with_jack:--disable-jackdigi} \
 	%{!?with_sse:--disable-sse} \
 	%{!?with_sse:--disable-asm} \
 %ifnarch %{ix86}
@@ -440,7 +443,7 @@
 %{__make} install install-man install-info install-lib \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install modules.lst $RPM_BUILD_ROOT%{_libdir}/allegro/4.1
+install modules.lst $RPM_BUILD_ROOT%{_libdir}/allegro/4.2
 
 mv $RPM_BUILD_ROOT%{_bindir}/demo{,-allegro}
 mv $RPM_BUILD_ROOT%{_bindir}/play{,-allegro}
@@ -467,8 +470,8 @@
 %doc AUTHORS CHANGES THANKS
 %attr(755,root,root) %{_libdir}/liballeg-%{version}.so
 %dir %{_libdir}/allegro
-%dir %{_libdir}/allegro/4.1
-%{_libdir}/allegro/4.1/modules.lst
+%dir %{_libdir}/allegro/4.2
+%{_libdir}/allegro/4.2/modules.lst
 
 %files devel
 %defattr(644,root,root,755)
@@ -508,44 +511,44 @@
 %if %{with svga}
 %files svgalib
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-svgalib.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-svgalib.so
 %endif
 
 %files dga2
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-dga2.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-dga2.so
 
 %files esd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-esddigi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-esddigi.so
 
 %if %{with arts}
 %files arts
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-artsdigi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-artsdigi.so
 %endif
 
 %files fbcon
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-fbcon.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-fbcon.so
 
 %ifarch %{ix86}
 %files vga
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-vga.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-vga.so
 %endif
 
 %if %{with alsa}
 %files alsa
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-alsadigi.so
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-alsamidi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-alsadigi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-alsamidi.so
 %endif
 
 %if %{with jack}
 %files jack
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/allegro/4.1/alleg-jackdigi.so
+%attr(755,root,root) %{_libdir}/allegro/4.2/alleg-jackdigi.so
 %endif
 
 %files tools
@@ -561,6 +564,8 @@
 %attr(755,root,root) %{_bindir}/grabber
 %attr(755,root,root) %{_bindir}/pat2dat
 %attr(755,root,root) %{_bindir}/setup-allegro
+%attr(755,root,root) %{_bindir}/xf2pcx
+%attr(755,root,root) %{_bindir}/xkeymap
 
 %files tests
 %defattr(644,root,root,755)
@@ -592,11 +597,11 @@
 %attr(755,root,root) %{_bindir}/excustom
 %attr(755,root,root) %{_bindir}/exdata
 %attr(755,root,root) %{_bindir}/exdbuf
-%attr(755,root,root) %{_bindir}/exdodgy
 %attr(755,root,root) %{_bindir}/exexedat
 %attr(755,root,root) %{_bindir}/exfixed
 %attr(755,root,root) %{_bindir}/exflame
 %attr(755,root,root) %{_bindir}/exflip
+%attr(755,root,root) %{_bindir}/exfont
 %attr(755,root,root) %{_bindir}/exgui
 %attr(755,root,root) %{_bindir}/exhello
 %attr(755,root,root) %{_bindir}/exjoy
@@ -605,6 +610,7 @@
 %attr(755,root,root) %{_bindir}/exmem
 %attr(755,root,root) %{_bindir}/exmidi
 %attr(755,root,root) %{_bindir}/exmouse
+%attr(755,root,root) %{_bindir}/expackf
 %attr(755,root,root) %{_bindir}/expal
 %attr(755,root,root) %{_bindir}/expat
 %attr(755,root,root) %{_bindir}/exquat
@@ -619,6 +625,7 @@
 %attr(755,root,root) %{_bindir}/exstars
 %attr(755,root,root) %{_bindir}/exstream
 %attr(755,root,root) %{_bindir}/exswitch
+%attr(755,root,root) %{_bindir}/exsyscur
 %attr(755,root,root) %{_bindir}/extimer
 %attr(755,root,root) %{_bindir}/extrans
 %attr(755,root,root) %{_bindir}/extruec
-------------- next part --------------
--- allegro-examples.patch.orig	2005-01-16 23:47:55.000000000 +0100
+++ allegro-examples.patch	2005-07-28 20:02:28.000000000 +0200
@@ -5,19 +5,18 @@
  	done
  
 -INSTALL_EXES = $(filter tools/%, $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES))
-+INSTALL_EXES = $(filter tools/% demo/% setup/% tests/% examples/%, $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES) $(ALLEGRO_EXAMPLE_EXES))
++INSTALL_EXES = $(filter tools/% demo/% setup/% tests/% examples/%, $(ALLEGRO_EXE_TARGETS))
  
  install-programs: $(INSTALL_EXES)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -617,9 +617,10 @@
+@@ -617,9 +617,9 @@
  	rm -rf $(includedir)/allegro
  
  uninstall-programs:
 -	@for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES); do \
 -	  if test "X`echo $$prog | sed -e s,tools/.\*,,`" = X; then \
 -	    p=`echo $$prog | sed -e s,tools/,,`; \
-+	@for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES) \
-+	  $(ALLEGRO_EXAMPLE_EXES) ; do \
++	@for prog in $(ALLEGRO_EXE_TARGETS); do \
 +	  if test "X`echo $$prog | sed -e s,.*/.\*,,`" = X; then \
 +	    p=`echo $$prog | sed -e s,,,`; \
  	    echo rm -f $(bindir)/$$p; \
-------------- next part --------------
--- allegro-frame-pointer.patch.orig	2005-07-28 15:22:38.000000000 +0200
+++ allegro-frame-pointer.patch	2005-07-28 15:41:29.000000000 +0200
@@ -1,7 +1,6 @@
-diff -urN aa/allegro-4.1.14/configure.in allegro-4.1.14/configure.in
---- aa/allegro-4.1.14/configure.in	2004-05-23 21:23:07.930046696 +0200
-+++ allegro-4.1.14/configure.in	2004-05-23 21:21:51.225707528 +0200
-@@ -245,7 +245,7 @@
+--- allegro-4.2.0.orig/configure.in	2005-07-28 15:36:08.000000000 +0200
++++ allegro-4.2.0/configure.in	2005-07-28 15:40:35.000000000 +0200
+@@ -271,7 +271,7 @@
    COMPILE_PROGRAM=COMPILE_PROFILE
    COMPILE_CXX_PROGRAM=COMPILE_CXX_PROFILE
    COMPILE_S_PROGRAM=COMPILE_S_PROFILE
@@ -10,12 +9,12 @@
    LIB_TO_LINK=allp
    PLUGIN_LIB=lib/unix/libapdat.a
    allegro_build_profiling_library=yes
-@@ -671,7 +671,7 @@
+@@ -722,7 +722,7 @@
       ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DDMALLOC"
    fi
    CFLAGS="$CFLAGS $TARGET_ARCH"
--	ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS"
-+	ALLEGRO_PROFILE_CFLAGS="$CFLAGS -fno-omit-frame-pointer -pg $WFLAGS"
+-  ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS"
++  ALLEGRO_PROFILE_CFLAGS="$CFLAGS -fno-omit-frame-pointer -pg $WFLAGS"
    ALLEGRO_SFLAGS="-x assembler-with-cpp"
    ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED"
  else
-------------- next part --------------
--- allegro-opt.patch.orig	2005-07-28 14:39:05.000000000 +0200
+++ allegro-opt.patch	2005-07-28 15:37:39.000000000 +0200
@@ -1,11 +1,11 @@
---- aa/allegro-4.1.15/configure.in	2004-04-27 13:53:02.000000000 +0200
-+++ allegro-4.1.15/configure.in	2004-05-23 21:18:36.478313632 +0200
-@@ -668,26 +662,7 @@
+--- allegro-4.2.0.orig/configure.in	2005-06-12 09:53:19.000000000 +0200
++++ allegro-4.2.0/configure.in	2005-07-28 15:36:08.000000000 +0200
+@@ -713,38 +713,7 @@
  
  dnl How to compile C and asm files.
  if test -n "GCC"; then
 -  if test "X$allegro_strict_warnings" = "Xyes"; then
--    WFLAGS="-Wall -W -Wstrict-prototypes -Wno-unused -Werror"
+-    WFLAGS="-Wall -W -Wstrict-prototypes -Wno-unused-parameter -Werror"
 -  else
 -    WFLAGS="-Wall -Wno-unused"
 -  fi
@@ -17,6 +17,18 @@
 -    else
 -      TARGET_ARCH="-mcpu=$allegro_optimizations"
 -    fi
+-  elif test "X$allegro_cv_processor_type" = "Xamd64"; then
+-    dnl Change default pentium->athlon64
+-    if test "X$allegro_optimizations" = "Xpentium"; then
+-      allegro_optimizations="k8"
+-    fi
+-    if test "$allegro_exclusive_optimizations" != none; then
+-      TARGET_ARCH="-march=$allegro_exclusive_optimizations"
+-    elif test "X$allegro_cv_support_amd64_mtune" = "Xyes"; then
+-      TARGET_ARCH="-mtune=$allegro_optimizations"
+-    else
+-      TARGET_ARCH="-mcpu=$allegro_optimizations"
+-    fi
 -  else
 -    TARGET_ARCH=
 -  fi
@@ -28,7 +40,7 @@
    ALLEGRO_DEBUG_CFLAGS="$CFLAGS -g $WFLAGS -DDEBUGMODE"
    if test "X$allegro_debug_with_fortify" = "Xyes"; then
       ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DFORTIFY"
-@@ -692,12 +670,8 @@
+@@ -752,12 +721,8 @@
    if test "X$allegro_debug_with_dmalloc" = "Xyes"; then
       ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DDMALLOC"
    fi
@@ -39,7 +51,7 @@
 -    CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
 -  fi
 +  CFLAGS="$CFLAGS $TARGET_ARCH"
-+	ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS"
++  ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS"
    ALLEGRO_SFLAGS="-x assembler-with-cpp"
    ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED"
  else

More information about the pld-devel-pl mailing list