From: Jakub Bogusz Date: Mon, 1 Apr 2013 12:19:36 +0000 (+0200) Subject: - updated to 5.0.9 X-Git-Tag: auto/th/allegro5-5.0.10-1~2 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fallegro5.git;a=commitdiff_plain;h=b1f05c3682a3be5035c6924737050f2782d5ae2a - updated to 5.0.9 - removed outdated patches - massive cleanups, updated BRs and bconds - package addon libraries (those without external dependencies in main package, the rest in subpackages) --- diff --git a/allegro5-config.patch b/allegro5-config.patch deleted file mode 100644 index 1c70910..0000000 --- a/allegro5-config.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- allegro-4.9.3/misc/allegro5-config.in~ 2008-05-12 13:17:40.502753489 +0200 -+++ allegro-4.9.3/misc/allegro5-config.in 2008-05-12 13:18:32.301896453 +0200 -@@ -185,9 +185,9 @@ - if test "$echo_libs" = "yes"; then - libdirs=-L$lib_path - if test "$static_libs" = "yes"; then -- echo $libdirs $allegro_ldflags -l$lib_type $allegro_libs -+ echo $libdirs$allegro_ldflags -l${lib_type} $allegro_libs - else -- echo $libdirs $allegro_ldflags -l$lib_type-$version -+ echo $libdirs$allegro_ldflags -l${lib_type}-${version} -l${lib_type}_unsharable - fi - fi - diff --git a/allegro5-examples.patch b/allegro5-examples.patch deleted file mode 100644 index 70c0079..0000000 --- a/allegro5-examples.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- allegro-4.9.2/makefile.in~ 2008-03-25 13:37:50.960766155 +0100 -+++ allegro-4.9.2/makefile.in 2008-03-25 13:40:51.949418447 +0100 -@@ -539,7 +536,7 @@ - $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/allegro5/platform/; \ - done - --INSTALL_EXES = $(filter tools/%, $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES)) -+INSTALL_EXES = $(filter tools/% demo/% setup/% tests/% examples/%, $(ALLEGRO_EXE_TARGETS)) - - install-programs: $(INSTALL_EXES) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -627,9 +627,9 @@ - rm -rf $(includedir)/allegro5 - - 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_EXE_TARGETS); do \ -+ if test "X`echo $$prog | sed -e s,.*/.\*,,`" = X; then \ -+ p=`echo $$prog | sed -e s,,,`; \ - echo rm -f $(bindir)/$$p; \ - rm -f $(bindir)/$$p; \ - fi; \ diff --git a/allegro5-frame-pointer.patch b/allegro5-frame-pointer.patch deleted file mode 100644 index 34de0a3..0000000 --- a/allegro5-frame-pointer.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- allegro-4.9.3/configure.in~ 2008-05-12 13:15:15.712498354 +0200 -+++ allegro-4.9.3/configure.in 2008-05-12 13:16:17.228772516 +0200 -@@ -275,7 +275,7 @@ - COMPILE_PROGRAM=COMPILE_DEBUG - COMPILE_CXX_PROGRAM=COMPILE_CXX_DEBUG - COMPILE_S_PROGRAM=COMPILE_S_DEBUG -- PROG_LDFLAGS="-g \$(LDFLAGS)" -+ PROG_LDFLAGS="-fno-omit-frame-pointer -pg \$(LDFLAGS)" - LIB_TO_LINK=alld - PLUGIN_LIB=lib/unix/libaddat.a - allegro_build_debugging_library=yes -@@ -824,7 +824,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_SFLAGS="-x assembler-with-cpp" - ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED" - else diff --git a/allegro5-headers.patch b/allegro5-headers.patch deleted file mode 100644 index a260d76..0000000 --- a/allegro5-headers.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- allegro-4.9.3/makefile.in~ 2008-05-09 21:10:49.143252185 +0200 -+++ allegro-4.9.3/makefile.in 2008-05-09 21:11:29.581852047 +0200 -@@ -56,7 +56,7 @@ - CONFIGURE_IN = configure.in - ACLOCAL_M4 = aclocal.m4 - --INCLUDES = -I. -Iinclude -Iinclude/allegro -I$(srcdir)/include -I$(srcdir)/include/allegro -+INCLUDES = -I. -Iinclude -Iinclude/allegro5 -I$(srcdir)/include -I$(srcdir)/include/allegro5 - DEFS = -DALLEGRO_MODULES_PATH=\"$(libdir)/allegro\" @DEFS@ - CPPFLAGS = @CPPFLAGS@ - override LDFLAGS += @LDFLAGS@ diff --git a/allegro5-info.patch b/allegro5-info.patch deleted file mode 100644 index 1dfb1a7..0000000 --- a/allegro5-info.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- allegro-4.9.3/docs/src/allegro._tx~ 2008-05-12 12:56:55.637348729 +0200 -+++ allegro-4.9.3/docs/src/allegro._tx 2008-05-12 12:57:43.472968879 +0200 -@@ -31,7 +31,7 @@ - @# This should remain commented at the moment (dvi output) @$@finalout - @$ - @$@ifinfo --@$@dircategory Libraries -+@$@dircategory Libraries: - @$@direntry - @$* Allegro: (allegro). The Allegro game programming library. - @$@end direntry diff --git a/allegro5-opt.patch b/allegro5-opt.patch deleted file mode 100644 index b97574e..0000000 --- a/allegro5-opt.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- allegro-4.9.3/configure.in~ 2008-05-12 13:00:38.307993655 +0200 -+++ allegro-4.9.3/configure.in 2008-05-12 13:13:44.638144481 +0200 -@@ -815,38 +815,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-parameter -Werror" -- else -- WFLAGS="-Wall -Wno-unused" -- fi -- if test "X$allegro_cv_processor_type" = "Xi386"; then -- if test "$allegro_exclusive_optimizations" != none; then -- TARGET_ARCH="-march=$allegro_exclusive_optimizations" -- elif test "X$allegro_cv_support_i386_mtune" = "Xyes"; then -- TARGET_ARCH="-mtune=$allegro_optimizations" -- 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 -- dnl Allow to specify additional flags. -- CFLAGS="$CFLAGS $XCFLAGS" -- WFLAGS="$WFLAGS $WCFLAGS" -- dnl In this order... -+ WFLAGS="-Wall -Wno-unused" - ALLEGRO_DEBUG_CFLAGS="$CFLAGS -g $WFLAGS -DDEBUGMODE" - if test "X$allegro_debug_with_fortify" = "Xyes"; then - ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DFORTIFY" -@@ -854,12 +823,8 @@ - if test "X$allegro_debug_with_dmalloc" = "Xyes"; then - ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DDMALLOC" - fi -- ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS" -- if test "X$allegro_cv_support_fomit_frame_pointer" = "Xyes"; then -- CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS" -- else -- CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS" -- fi -+ CFLAGS="$CFLAGS $TARGET_ARCH" -+ ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS" - ALLEGRO_SFLAGS="-x assembler-with-cpp" - ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED" - else diff --git a/allegro5.spec b/allegro5.spec index 2626ee9..65d75a2 100644 --- a/allegro5.spec +++ b/allegro5.spec @@ -1,21 +1,22 @@ # -# TODO: - Handle situations when there are no modules (most bconds turned off) -# - make bconds work again or remove -# - make it usable +# TODO: +# - texinfo docs (BR: pandoc) +# - check if it's usable now # # Conditional build: -%bcond_without alsa # without ALSA modules -#%%bcond_without arts # without aRts module -#%%bcond_without dga2 # without DGA2 module -#%%bcond_without dbglib # don't build debug versions of library -#%%bcond_without esd # without esound module -#%%bcond_without fbcon # without framebuffer module -#%%bcond_without jack # without JACK module -#%%bcond_without proflib # don't debug profiling versions of library -#%%bcond_without sse # build without sse -#%%bcond_without svga # without svgalib module -#%%bcond_without vga # without vga module +%bcond_without alsa # ALSA support in allegro_audio library +%bcond_with curl # cURL example +%bcond_without dumb # MOD support in allegro_acodec library +%bcond_without gtk # (GTK+ 2.x based) native dialog library +%bcond_without openal # OpenAL support in allegro_audio library +%bcond_without physfs # PhysFS addon library +%bcond_without pulseaudio # PulseAudio support in allegro_audio library +%bcond_without python # Python wrapper +%bcond_with sse # SSE instructions usage # +%ifarch pentium3 pentium4 %{x8664} +%define with_sse 1 +%endif Summary: A game programming library Summary(de.UTF-8): Eine Bibliothek zur Programmierung von Spielen Summary(es.UTF-8): Una biblioteca de programación de juegos @@ -23,39 +24,46 @@ Summary(fr.UTF-8): Une librairie de programmation de jeux Summary(it.UTF-8): Una libreria per la programmazione di videogiochi Summary(pl.UTF-8): Biblioteka do programowania gier Name: allegro5 -Version: 5.0.3 +Version: 5.0.9 Release: 0.1 License: Giftware Group: Libraries Source0: http://downloads.sourceforge.net/alleg/allegro-%{version}.tar.gz -# Source0-md5: 159ca85ea51c0447d951d720b06079f2 -Patch0: %{name}-info.patch -Patch1: %{name}-examples.patch -Patch2: %{name}-opt.patch -Patch3: %{name}-frame-pointer.patch -Patch4: %{name}-config.patch +# Source0-md5: 59fb41dccc300be0044cfad5fff0ca81 URL: http://alleg.sourceforge.net/ +%{?with_openal:BuildRequires: OpenAL-devel} BuildRequires: OpenGL-GLU-devel +BuildRequires: OpenGL-devel %{?with_alsa:BuildRequires: alsa-lib-devel} -#%%{?with_arts:BuildRequires: artsc-devel} BuildRequires: cmake >= 2.6 -BuildRequires: curl-devel -#%%{?with_esd:BuildRequires: esound-devel} -#%%if %{with jack} -#BuildRequires: jack-audio-connection-kit-devel -#BuildRequires: physfs-devel -#BuildRequires: pkgconfig -#%%endif -BuildRequires: rpmbuild(macros) >= 1.600 -#BuildRequires: sed >= 4.0 -#%%{?with_svga:BuildRequires: svgalib-devel} +%{?with_curl:BuildRequires: curl-devel} +BuildRequires: dumb-devel +BuildRequires: flac-devel +BuildRequires: freetype-devel +%{?with_gtk:BuildRequires: glib2-devel >= 2.0} +%{?with_gtk:BuildRequires: gtk+2-devel >= 2.0} +BuildRequires: libjpeg-devel +BuildRequires: libogg-devel +BuildRequires: libpng-devel +BuildRequires: libvorbis-devel +%{?with_physfs:BuildRequires: physfs-devel} +BuildRequires: pkgconfig +%{?with_pulseaudio:BuildRequires: pulseaudio-devel >= 0.9.15} +BuildRequires: rpmbuild(macros) >= 1.605 #BuildRequires: texinfo BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXcursor-devel BuildRequires: xorg-lib-libXext-devel +BuildRequires: xorg-lib-libXinerama-devel BuildRequires: xorg-lib-libXpm-devel -#BuildRequires: xorg-lib-libXxf86dga-devel +BuildRequires: xorg-lib-libXrandr-devel BuildRequires: xorg-lib-libXxf86vm-devel +BuildRequires: zlib-devel +%if %{with python} +BuildRequires: python +BuildRequires: python-modules +BuildRequires: rpm-pythonprov +%endif Obsoletes: allegro BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -126,187 +134,155 @@ grach komputerowych i innych rodzajach oprogramowania multimedialnego. Ten pakiet zawiera pliki nagłówkowe niezbędne do kompilowania aplikacji wykorzystujących bibliotekę allegro. -%package debug -Summary: liballd - debug version of shared allegro library -Summary(pl.UTF-8): liballd - wersja debug dzielonej biblioteki allegro -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Obsoletes: allegro-debug +%package acodec +Summary: Allegro acodec addon library +Summary(pl.UTF-8): Biblioteka dodatkowa Allegro acodec +Group: Libraries +Requires: %{name}-audio = %{version}-%{release} -%description debug -liballd - debug version of shared allegro library (contains debugging -symbols and other information). +%description acodec +Allegro acodec addon library. -%description debug -l pl.UTF-8 -liballd - wersja debug dzielonej biblioteki allegro (zawierająca -symbole i inne informacje potrzebne przy odpluskwianiu). +%description acodec -l pl.UTF-8 +Biblioteka dodatkowa Allegro acodec. -%package profile -Summary: liballp - profiling version of shared allegro library -Summary(pl.UTF-8): liballp - wersja dzielonej biblioteki allegro służąca do profilowania -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Obsoletes: allegro-profile +%package acodec-devel +Summary: Header files for Allegro acodec addon library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki dodatkowej Allegro acodec +Group: Libraries +Requires: %{name}-acodec = %{version}-%{release} +Requires: %{name}-audio-devel = %{version}-%{release} -%description profile -liballp - profiling version of shared allegro library. +%description acodec-devel +Header files for Allegro acodec addon library. -%description profile -l pl.UTF-8 -liballp - wersja dzielonej biblioteki allegro służąca do profilowania. +%description acodec-devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki dodatkowej Allegro acodec. -%package svgalib -Summary: A game programming library - svgalib module -Summary(pl.UTF-8): Biblioteka do programowania gier - moduł dla svgalib +%package audio +Summary: Allegro audio addon library +Summary(pl.UTF-8): Biblioteka dodatkowa Allegro audio Group: Libraries Requires: %{name} = %{version}-%{release} -Obsoletes: allegro-svgalib - -%description svgalib -Allegro is a cross-platform library intended for use in computer games -and other types of multimedia programming. -This package contains module for use with allegro and svgalib. +%description audio +Allegro audio addon library. -%description svgalib -l pl.UTF-8 -Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w -grach komputerowych i innych rodzajach oprogramowania multimedialnego. +%description audio -l pl.UTF-8 +Biblioteka dodatkowa Allegro audio. -Ten pakiet zawiera moduł do wykorzystania allegro z svgalibem. - -%package dga2 -Summary: A game programming library - DGA2 module -Summary(pl.UTF-8): Biblioteka do programowania gier - moduł dla DGA2 +%package audio-devel +Summary: Header files for Allegro audio addon library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki dodatkowej Allegro audio Group: Libraries -Requires: %{name} = %{version}-%{release} -Obsoletes: allegro-dga2 - -%description dga2 -Allegro is a cross-platform library intended for use in computer games -and other types of multimedia programming. +Requires: %{name}-audio = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} -This package contains module for use with DGA. +%description audio-devel +Header files for Allegro audio addon library. -%description dga2 -l pl.UTF-8 -Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w -grach komputerowych i innych rodzajach oprogramowania multimedialnego. - -Ten pakiet zawiera moduł do wykorzystania z DGA. +%description audio-devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki dodatkowej Allegro audio. -%package esd -Summary: A game programming library - esound module -Summary(pl.UTF-8): Biblioteka do programowania gier - moduł dla esound +%package dialog +Summary: Allegro dialog addon library +Summary(pl.UTF-8): Biblioteka dodatkowa Allegro dialog Group: Libraries Requires: %{name} = %{version}-%{release} -Obsoletes: allegro-esd -%description esd -Allegro is a cross-platform library intended for use in computer games -and other types of multimedia programming. - -This package contains a esound module for use with ESound daemon. - -%description esd -l pl.UTF-8 -Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w -grach komputerowych i innych rodzajach oprogramowania multimedialnego. +%description dialog +Allegro dialog addon library. -Ten pakiet zawiera moduł do wykorzystania z demonem ESound. +%description dialog -l pl.UTF-8 +Biblioteka dodatkowa Allegro dialog. -%package arts -Summary: A game programming library - aRts module -Summary(pl.UTF-8): Biblioteka do programowania gier - moduł dla aRts +%package dialog-devel +Summary: Header files for Allegro dialog addon library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki dodatkowej Allegro dialog Group: Libraries -Requires: %{name} = %{version}-%{release} -Obsoletes: allegro-arts - -%description arts -Allegro is a cross-platform library intended for use in computer games -and other types of multimedia programming. - -This package contains a esound module for use with aRts. +Requires: %{name}-dialog = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} -%description arts -l pl.UTF-8 -Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w -grach komputerowych i innych rodzajach oprogramowania multimedialnego. +%description dialog-devel +Header files for Allegro dialog addon library. -Ten pakiet zawiera moduł do wykorzystania z aRts. +%description dialog-devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki dodatkowej Allegro dialog. -%package fbcon -Summary: A game programming library - framebuffer module -Summary(pl.UTF-8): Biblioteka do programowania gier - moduł dla framebuffera +%package image +Summary: Allegro image addon library +Summary(pl.UTF-8): Biblioteka dodatkowa Allegro image Group: Libraries Requires: %{name} = %{version}-%{release} -Obsoletes: allegro-fbcon -%description fbcon -Allegro is a cross-platform library intended for use in computer games -and other types of multimedia programming. +%description image +Allegro image addon library. -This package contains a esound module for use with framebuffer. +%description image -l pl.UTF-8 +Biblioteka dodatkowa Allegro image. -%description fbcon -l pl.UTF-8 -Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w -grach komputerowych i innych rodzajach oprogramowania multimedialnego. - -Ten pakiet zawiera moduł do wykorzystania z framebufferem. - -%package vga -Summary: A game programming library - vga module -Summary(pl.UTF-8): Biblioteka do programowania gier - moduł dla vga +%package image-devel +Summary: Header files for Allegro image addon library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki dodatkowej Allegro image Group: Libraries -Requires: %{name} = %{version}-%{release} -Obsoletes: allegro-vga - -%description vga -Allegro is a cross-platform library intended for use in computer games -and other types of multimedia programming. - -This package contains a esound module for use with vga. +Requires: %{name}-image = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} -%description vga -l pl.UTF-8 -Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w -grach komputerowych i innych rodzajach oprogramowania multimedialnego. +%description image-devel +Header files for Allegro image addon library. -Ten pakiet zawiera moduł do wykorzystania z vga. +%description image-devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki dodatkowej Allegro image. -%package alsa -Summary: A game programming library - ALSA modules -Summary(pl.UTF-8): Biblioteka do programowania gier - moduły dla ALSA +%package physfs +Summary: Allegro physfs addon library +Summary(pl.UTF-8): Biblioteka dodatkowa Allegro physfs Group: Libraries Requires: %{name} = %{version}-%{release} -Obsoletes: allegro-alsa -Obsoletes: allegro-alsa9 -%description alsa -Allegro is a cross-platform library intended for use in computer games -and other types of multimedia programming. +%description physfs +Allegro physfs addon library. -This package contains modules for use with ALSA sound library. +%description physfs -l pl.UTF-8 +Biblioteka dodatkowa Allegro physfs. -%description alsa -l pl.UTF-8 -Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w -grach komputerowych i innych rodzajach oprogramowania multimedialnego. +%package physfs-devel +Summary: Header files for Allegro physfs addon library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki dodatkowej Allegro physfs +Group: Libraries +Requires: %{name}-physfs = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} -Ten pakiet zawiera moduły do wykorzystania z biblioteką dźwiękową -ALSA. +%description physfs-devel +Header files for Allegro physfs addon library. -%package jack -Summary: A game programming library - JACK module -Summary(pl.UTF-8): Biblioteka do programowania gier - moduł dla JACK-a +%description physfs-devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki dodatkowej Allegro physfs. + +%package ttf +Summary: Allegro ttf addon library +Summary(pl.UTF-8): Biblioteka dodatkowa Allegro ttf Group: Libraries Requires: %{name} = %{version}-%{release} -Obsoletes: allegro-jack -%description jack -Allegro is a cross-platform library intended for use in computer games -and other types of multimedia programming. +%description ttf +Allegro ttf addon library. -This package contains module for use with JACK sound library. +%description ttf -l pl.UTF-8 +Biblioteka dodatkowa Allegro ttf. -%description jack -l pl.UTF-8 -Allegro jest przenośną biblioteką przeznaczoną do wykorzystania w -grach komputerowych i innych rodzajach oprogramowania multimedialnego. +%package ttf-devel +Summary: Header files for Allegro ttf addon library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki dodatkowej Allegro ttf +Group: Libraries +Requires: %{name}-ttf = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} -Ten pakiet zawiera moduł do wykorzystania z biblioteką dźwiękową JACK. +%description ttf-devel +Header files for Allegro ttf addon library. + +%description ttf-devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki dodatkowej Allegro ttf. %package tools Summary: A game programming library - tools @@ -355,19 +331,6 @@ grach komputerowych i innych rodzajach oprogramowania multimedialnego. Ten pakiet zawiera narzędzia. -%package tests -Summary: A game programming library - test programs -Summary(pl.UTF-8): Biblioteka do programowania gier - programy testujące -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Obsoletes: allegro-tests - -%description tests -This package contains programs for testing allegro library. - -%description tests -l pl.UTF-8 -Pakiet zawiera programy testujące bibliotekę allegro. - %package examples Summary: A game programming library - examples Summary(pl.UTF-8): Biblioteka do programowania gier - programy przykładowe @@ -383,45 +346,37 @@ features. Pakiet zawiera programy przykładowe demonstrujące możliwości biblioteki allegro. +%package -n python-%{name} +Summary: Python wrapper for Allegro library +Summary(pl.UTF-8): Pythonowy interfejs do biblioteki Allegro +Group: Development/Languages/Python +Requires: %{name} = %{version}-%{release} +Requires: python-modules + +%description -n python-%{name} +Python wrapper for Allegro library. + +%description -n python-%{name} -l pl.UTF-8 +Pythonowy interfejs do biblioteki Allegro. + %prep %setup -q -n allegro-%{version} -#%%patch0 -p1 -#%%patch1 -p1 -#%%patch2 -p1 -#%%patch3 -p1 -#%%patch4 -p1 - -#find include/allegro5 -name '*.h' -print0 | xargs -0 %{__sed} -i -e 's@allegro5/@%{_headers_dir}/include/allegro5@' -#%%{__sed} -i -e 's@allegro5/@../@' include/allegro5/internal/alconfig.h %build -#TARGET_ARCH="%{rpmcflags}" export TARGET_ARCH -# dbglib & proflib are compiled besides normlib, so it's ok to have them here -#%%configure \ -#% %{?with_dbglib:--enable-dbglib} \ -#% %{?with_proflib:--enable-proflib} \ -#%%endif -#% %{!?with_arts:--disable-artsdigi} \ -#% %{!?with_dga2:--disable-xwin-dga2} \ -#% %{!?with_esd:--disable-esddigi} \ -#% %{!?with_fbcon:--disable-fbcon} \ -#% %{!?with_jack:--disable-jackdigi} \ -#% %{!?with_svga:--disable-svgalib} \ -#% %{!?with_vga:--disable-vga} \ -#%%if !%{with sse} -# --disable-sse \ -# --disable-asm \ -#%%endif -#%%ifnarch %{ix86} -# --disable-asm \ -# --disable-mmx \ -# --disable-sse -#%%endif install -d build cd build %cmake .. \ -DMANDIR=%{_mandir} \ - -DINFODIR=%{_infodir} + -DINFODIR=%{_infodir} \ + %{!?with_sse:-DWANT_ALLOW_SSE=OFF} \ + %{!?with_alsa:-DWANT_ALSA=OFF} \ + %{?with_curl:-DWANT_CURL_EXAMPLE=ON} \ + %{!?with_dumb:-DWANT_MODAUDIO=OFF} \ + %{!?with_gtk:-DWANT_NATIVE_DIALOG=OFF} \ + %{!?with_openal:-DWANT_OPENAL=OFF} \ + %{!?with_physfs:-DWANT_PHYSFS=OFF} \ + %{!?with_pulseaudio:-DWANT_PULSEAUDIO=OFF} \ + %{?with_python:-DWANT_PYTHON_WRAPPER=ON} %{__make} @@ -432,19 +387,19 @@ install -d $RPM_BUILD_ROOT%{_bindir} %{__make} install -C build \ DESTDIR=$RPM_BUILD_ROOT -#install modules.lst $RPM_BUILD_ROOT%{_libdir}/allegro/%{version} +%if %{with python} +install -d $RPM_BUILD_ROOT%{py_sitescriptdir} +install build/python/allegro.py $RPM_BUILD_ROOT%{py_sitescriptdir} +%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir} +%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir} +%py_postclean +%endif -# install examples and tests -find build/examples -maxdepth 1 -perm 755 -name "ex*" -exec install {} $RPM_BUILD_ROOT%{_bindir} \; -#find build/tests -maxdepth 1 -perm 755 ! -name CMakeFiles -exec install {} $RPM_BUILD_ROOT - -#mv $RPM_BUILD_ROOT%{_bindir}/demo{,-allegro} -#mv $RPM_BUILD_ROOT%{_bindir}/play{,-allegro} -#mv $RPM_BUILD_ROOT%{_bindir}/setup{,-allegro} -#mv $RPM_BUILD_ROOT%{_bindir}/test{,-allegro} +install -d $RPM_BUILD_ROOT%{_mandir}/man3 +cp -p docs/man/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 -# help rpm to find reqs for ELF objects -#chmod 755 $RPM_BUILD_ROOT%{_libdir}/{*.so,allegro/*/*.so} +# install examples +find build/examples -maxdepth 1 -perm 755 -name "ex*" -exec install {} $RPM_BUILD_ROOT%{_bindir} \; %clean rm -rf $RPM_BUILD_ROOT @@ -452,6 +407,24 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post acodec -p /sbin/ldconfig +%postun acodec -p /sbin/ldconfig + +%post audio -p /sbin/ldconfig +%postun audio -p /sbin/ldconfig + +%post dialog -p /sbin/ldconfig +%postun dialog -p /sbin/ldconfig + +%post image -p /sbin/ldconfig +%postun image -p /sbin/ldconfig + +%post physfs -p /sbin/ldconfig +%postun physfs -p /sbin/ldconfig + +%post ttf -p /sbin/ldconfig +%postun ttf -p /sbin/ldconfig + #%%post devel -p /sbin/postshell #-/usr/sbin/fix-info-dir -c %{_infodir} @@ -463,116 +436,134 @@ rm -rf $RPM_BUILD_ROOT %doc CHANGES-5.0.txt README.txt docs/html/refman %attr(755,root,root) %{_libdir}/liballegro.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/liballegro.so.5.0 +%attr(755,root,root) %{_libdir}/liballegro_color.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liballegro_color.so.5.0 +%attr(755,root,root) %{_libdir}/liballegro_font.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liballegro_font.so.5.0 +%attr(755,root,root) %{_libdir}/liballegro_main.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liballegro_main.so.5.0 +%attr(755,root,root) %{_libdir}/liballegro_memfile.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liballegro_memfile.so.5.0 +%attr(755,root,root) %{_libdir}/liballegro_primitives.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liballegro_primitives.so.5.0 %files devel %defattr(644,root,root,755) -#%%attr(755,root,root) %{_bindir}/allegro5-config -#%%{_libdir}/liballeg_unsharable.a -%{_libdir}/liballegro.so -%{_includedir}/* -#%%{_aclocaldir}/allegro.m4 -#%%{_mandir}/man3/* -#%%{_infodir}/*.info* - -#%%if %{with dbglib} -#%%files debug -#%%defattr(644,root,root,755) -#%%attr(755,root,root) %{_libdir}/liballd-%{version}.so -#%%{_libdir}/liballd_unsharable.a - -#%%if %{with proflib} -#%%files profile -#%%defattr(644,root,root,755) -#%%attr(755,root,root) %{_libdir}/liballp-%{version}.so -#%%{_libdir}/liballp_unsharable.a - -#%%if %{with svga} -#%%files svgalib -#%%defattr(644,root,root,755) -#%%attr(755,root,root) %{_libdir}/allegro/%{version}/alleg-svgalib.so -#%%endif - -#%%if %{with dga2} -#%%files dga2 -#%%defattr(644,root,root,755) -#%%attr(755,root,root) %{_libdir}/allegro/%{version}/alleg-dga2.so -#%%endif - -#%%if %{with esd} -#%%files esd -#%%defattr(644,root,root,755) -#%%attr(755,root,root) %{_libdir}/allegro/%{version}/alleg-esddigi.so -#%%endif - -#%%if %{with arts} -#%%files arts -#%%defattr(644,root,root,755) -#%%attr(755,root,root) %{_libdir}/allegro/%{version}/alleg-artsdigi.so -#%%endif - -#%%if %{with fbcon} -#%%files fbcon -#%%defattr(644,root,root,755) -#%%attr(755,root,root) %{_libdir}/allegro/%{version}/alleg-fbcon.so -#%%endif - -#%%ifarch %{ix86} -#%%if %{with vga} -#%%files vga -#%%defattr(644,root,root,755) -#%%attr(755,root,root) %{_libdir}/allegro/%{version}/alleg-vga.so -#%%endif -#%%endif - -#%%if %{with alsa} -#%%files alsa -#%%defattr(644,root,root,755) -#%%attr(755,root,root) %{_libdir}/allegro/%{version}/alleg-alsadigi.so -#%%attr(755,root,root) %{_libdir}/allegro/%{version}/alleg-alsamidi.so -#%%endif - -#%%if %{with jack} -#%%files jack -#%%defattr(644,root,root,755) -#%%attr(755,root,root) %{_libdir}/allegro/%{version}/alleg-jackdigi.so -#%%endif - -#%%files tools -#%%defattr(644,root,root,755) -#%%attr(755,root,root) %{_bindir}/colormap -#%%attr(755,root,root) %{_bindir}/exedat -#%%attr(755,root,root) %{_bindir}/pack -#%%attr(755,root,root) %{_bindir}/rgbmap -#%%attr(755,root,root) %{_bindir}/textconv +%attr(755,root,root) %{_libdir}/liballegro.so +%attr(755,root,root) %{_libdir}/liballegro_color.so +%attr(755,root,root) %{_libdir}/liballegro_font.so +%attr(755,root,root) %{_libdir}/liballegro_main.so +%attr(755,root,root) %{_libdir}/liballegro_memfile.so +%attr(755,root,root) %{_libdir}/liballegro_primitives.so +%{_includedir}/allegro5 +%exclude %{_includedir}/allegro5/allegro_acodec.h +%exclude %{_includedir}/allegro5/allegro_audio.h +%exclude %{_includedir}/allegro5/allegro_image.h +%{?with_gtk:%exclude %{_includedir}/allegro5/allegro_native_dialog.h} +%{?with_physfs:%exclude %{_includedir}/allegro5/allegro_physfs.h} +%exclude %{_includedir}/allegro5/allegro_ttf.h +%{_pkgconfigdir}/allegro-5.0.pc +%{_pkgconfigdir}/allegro-5.pc +%{_pkgconfigdir}/allegro_color-5.0.pc +%{_pkgconfigdir}/allegro_color-5.pc +%{_pkgconfigdir}/allegro_font-5.0.pc +%{_pkgconfigdir}/allegro_font-5.pc +%{_pkgconfigdir}/allegro_main-5.0.pc +%{_pkgconfigdir}/allegro_main-5.pc +%{_pkgconfigdir}/allegro_memfile-5.0.pc +%{_pkgconfigdir}/allegro_memfile-5.pc +%{_pkgconfigdir}/allegro_primitives-5.0.pc +%{_pkgconfigdir}/allegro_primitives-5.pc +%{_mandir}/man3/ALLEGRO_*.3* +%{_mandir}/man3/al_*.3* + +%files acodec +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liballegro_acodec.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liballegro_acodec.so.5.0 + +%files acodec-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liballegro_acodec.so +%{_includedir}/allegro5/allegro_acodec.h +%{_pkgconfigdir}/allegro_acodec-5.0.pc +%{_pkgconfigdir}/allegro_acodec-5.pc + +%files audio +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liballegro_audio.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liballegro_audio.so.5.0 + +%files audio-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liballegro_audio.so +%{_includedir}/allegro5/allegro_audio.h +%{_pkgconfigdir}/allegro_audio-5.0.pc +%{_pkgconfigdir}/allegro_audio-5.pc + +%if %{with gtk} +%files dialog +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liballegro_dialog.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liballegro_dialog.so.5.0 + +%files dialog-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liballegro_dialog.so +%{_includedir}/allegro5/allegro_native_dialog.h +%{_pkgconfigdir}/allegro_dialog-5.0.pc +%{_pkgconfigdir}/allegro_dialog-5.pc +%endif + +%files image +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liballegro_image.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liballegro_image.so.5.0 + +%files image-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liballegro_image.so +%{_includedir}/allegro5/allegro_image.h +%{_pkgconfigdir}/allegro_image-5.0.pc +%{_pkgconfigdir}/allegro_image-5.pc + +%if %{with physfs} +%files physfs +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liballegro_physfs.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liballegro_physfs.so.5.0 + +%files physfs-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liballegro_physfs.so +%{_includedir}/allegro5/allegro_physfs.h +%{_pkgconfigdir}/allegro_physfs-5.0.pc +%{_pkgconfigdir}/allegro_physfs-5.pc +%endif + +%files ttf +%defattr(644,root,root,755) +%attr(755,root,root) %ghost %{_libdir}/liballegro_ttf.so.5.0 +%attr(755,root,root) %{_libdir}/liballegro_ttf.so.*.*.* + +%files ttf-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liballegro_ttf.so +%{_includedir}/allegro5/allegro_ttf.h +%{_pkgconfigdir}/allegro_ttf-5.0.pc +%{_pkgconfigdir}/allegro_ttf-5.pc + +#%files tools +#%defattr(644,root,root,755) #%attr(755,root,root) %{_bindir}/xkeymap -#%%attr(755,root,root) %{_bindir}/xf2pcx -#%%attr(755,root,root) %{_bindir}/dat -#%%attr(755,root,root) %{_bindir}/dat2c -#%%attr(755,root,root) %{_bindir}/dat2s -#%%attr(755,root,root) %{_bindir}/grabber -#%%attr(755,root,root) %{_bindir}/pat2dat -#%%attr(755,root,root) %{_bindir}/setup-allegro - -#%%files tests -#%%defattr(644,root,root,755) -#%%attr(755,root,root) %{_bindir}/afinfo -#%%attr(755,root,root) %{_bindir}/akaitest -#%%attr(755,root,root) %{_bindir}/cpptest -#%%attr(755,root,root) %{_bindir}/demo-allegro -#%%attr(755,root,root) %{_bindir}/digitest -#%%attr(755,root,root) %{_bindir}/filetest -#%%attr(755,root,root) %{_bindir}/gfxinfo -#%%attr(755,root,root) %{_bindir}/mathtest -#%%attr(755,root,root) %{_bindir}/miditest -#%%attr(755,root,root) %{_bindir}/play-allegro -#%%attr(755,root,root) %{_bindir}/playfli -#%%attr(755,root,root) %{_bindir}/test-allegro -#%%attr(755,root,root) %{_bindir}/vesainfo +#%attr(755,root,root) %{_bindir}/xf2pcx +#%attr(755,root,root) %{_bindir}/xfixicon.sh %files examples %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/ex_acodec %attr(755,root,root) %{_bindir}/ex_acodec_multi +%attr(755,root,root) %{_bindir}/ex_audio_chain %attr(755,root,root) %{_bindir}/ex_audio_props %attr(755,root,root) %{_bindir}/ex_audio_simple %attr(755,root,root) %{_bindir}/ex_bitmap @@ -587,14 +578,17 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/ex_color %attr(755,root,root) %{_bindir}/ex_config %attr(755,root,root) %{_bindir}/ex_convert +%{?with_curl:%attr(755,root,root) %{_bindir}/ex_curl} %attr(755,root,root) %{_bindir}/ex_dir %attr(755,root,root) %{_bindir}/ex_disable_screensaver +%attr(755,root,root) %{_bindir}/ex_display_events %attr(755,root,root) %{_bindir}/ex_display_options %attr(755,root,root) %{_bindir}/ex_draw %attr(755,root,root) %{_bindir}/ex_draw_bitmap %attr(755,root,root) %{_bindir}/ex_drawpixels %attr(755,root,root) %{_bindir}/ex_dualies %attr(755,root,root) %{_bindir}/ex_expose +%attr(755,root,root) %{_bindir}/ex_file_slice %attr(755,root,root) %{_bindir}/ex_filter %attr(755,root,root) %{_bindir}/ex_font %attr(755,root,root) %{_bindir}/ex_fs_resize @@ -604,6 +598,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/ex_glext %attr(755,root,root) %{_bindir}/ex_haiku %attr(755,root,root) %{_bindir}/ex_icon +%attr(755,root,root) %{_bindir}/ex_icon2 %attr(755,root,root) %{_bindir}/ex_joystick_events %attr(755,root,root) %{_bindir}/ex_joystick_hotplugging %attr(755,root,root) %{_bindir}/ex_font_justify @@ -631,9 +626,11 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/ex_opengl_pixel_shader %attr(755,root,root) %{_bindir}/ex_path %attr(755,root,root) %{_bindir}/ex_path_test +%{?with_physfs:%attr(755,root,root) %{_bindir}/ex_physfs} %attr(755,root,root) %{_bindir}/ex_pixelformat %attr(755,root,root) %{_bindir}/ex_premulalpha %attr(755,root,root) %{_bindir}/ex_prim +%attr(755,root,root) %{_bindir}/ex_resample_test %attr(755,root,root) %{_bindir}/ex_resize %attr(755,root,root) %{_bindir}/ex_resize2 %attr(755,root,root) %{_bindir}/ex_rotate @@ -655,3 +652,9 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/ex_warp_mouse %attr(755,root,root) %{_bindir}/ex_windows %attr(755,root,root) %{_bindir}/ex_winfull + +%if %{with python} +%files -n python-%{name} +%defattr(644,root,root,755) +%{py_sitescriptdir}/allegro.py[co] +%endif