rpms/SDL/devel SDL-1.2.11-dynamic-esd.patch, NONE, 1.1 SDL-1.2.11-fixman.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 SDL.spec, 1.51, 1.52 sources, 1.13, 1.14

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Mar 19 17:54:57 UTC 2007 

Author: twoerner

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8909

Modified Files:
	.cvsignore SDL.spec sources 
Added Files:
	SDL-1.2.11-dynamic-esd.patch SDL-1.2.11-fixman.patch 
Log Message:
[tw]
- new version 1.2.11
- fixed man page SDL_ListModes (rhbz#208212)
- fixed spurious esound, audiofile dependencies (rhbz#217389)
  Thanks to Ville Skyttä for the patch
- dropped requirements for imake and libXt-devel (rhbz#226402)
- made nasm arch %%{ix86} only (rhbz#226402)
- dropped O3 from options (rhbz#226402)
- dropped tagname environment variable (rhbz#226402)



SDL-1.2.11-dynamic-esd.patch:
 configure.in |   10 ++++++++++
 1 files changed, 10 insertions(+)

--- NEW FILE SDL-1.2.11-dynamic-esd.patch ---
--- SDL-1.2.11/configure.in.dynamic-esd	2007-03-19 17:44:47.000000000 +0100
+++ SDL-1.2.11/configure.in	2007-03-19 17:44:47.000000000 +0100
@@ -430,6 +430,16 @@
             AC_ARG_ENABLE(esd-shared,
 AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]),
                           , enable_esd_shared=yes)
+            if test "x`echo $ESD_LIBS | grep -- -L`" = "x"; then
+                pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libesd.so.* 2> /dev/null`" != "x"; then
+                    ESD_LIBS="-L/${pfx} $ESD_LIBS"
+                elif test "x`ls /usr/${pfx}/libesd.so.* 2> /dev/null`" != "x"; then
+                    ESD_LIBS="-L/usr/${pfx} $ESD_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libesd.so.* 2> /dev/null`" != "x"; then
+                    ESD_LIBS="-L/usr/local/${pfx} $ESD_LIBS"
+                fi
+            fi
             esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
             esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
             echo "-- $esd_lib_spec -> $esd_lib"

SDL-1.2.11-fixman.patch:
 SDL_ListModes.3 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE SDL-1.2.11-fixman.patch ---
--- SDL-1.2.11/docs/man3/SDL_ListModes.3.fixman	2007-03-19 18:01:29.000000000 +0100
+++ SDL-1.2.11/docs/man3/SDL_ListModes.3	2007-03-19 18:01:34.000000000 +0100
@@ -1,6 +1,6 @@
 .TH "SDL_ListModes" "3" "Tue 11 Sep 2001, 23:01" "SDL" "SDL API Reference" 
 .SH "NAME"
-SDL_ListModes\- Returns a pointer to an array of available screen dimensions for the given format and video flags
+SDL_ListModes \- Returns a pointer to an array of available screen dimensions for the given format and video flags
 .SH "SYNOPSIS"
 .PP
 \fB#include "SDL\&.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	19 May 2006 09:25:06 -0000	1.13
+++ .cvsignore	19 Mar 2007 17:54:55 -0000	1.14
@@ -1 +1,2 @@
 SDL-1.2.10.tar.gz
+SDL-1.2.11.tar.gz


Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- SDL.spec	2 Nov 2006 17:50:17 -0000	1.51
+++ SDL.spec	19 Mar 2007 17:54:55 -0000	1.52
@@ -1,7 +1,7 @@
-Summary: A cross-platform multimedia library.
+Summary: A cross-platform multimedia library
 Name: SDL
-Version: 1.2.10
-Release: 9
+Version: 1.2.11
+Release: 1
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Source2: SDL_config.h
 Patch0: SDL-1.2.10-byteorder.patch
@@ -9,16 +9,21 @@
 Patch19: SDL-1.2.10-preferalsa.patch
 Patch20: SDL-1.2.10-pagesize.patch
 Patch21: SDL-1.2.10-multilib.patch
+Patch22: SDL-1.2.11-fixman.patch
+Patch23: SDL-1.2.11-dynamic-esd.patch
 URL: http://www.libsdl.org/
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: nasm arts-devel audiofile-devel
+BuildRequires: arts-devel audiofile-devel
 BuildRequires: esound-devel alsa-lib-devel
 BuildRequires: libXext-devel libX11-devel
 BuildRequires: libGL-devel libGLU-devel
-BuildRequires: libXt-devel libXrender-devel libXrandr-devel gettext-devel
-BuildRequires: imake automake autoconf
+BuildRequires: libXrender-devel libXrandr-devel gettext-devel
+BuildRequires: automake autoconf
+%ifarch %{ix86}
+BuildRequires: nasm
+%endif
 
 %description
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -33,7 +38,8 @@
 Requires: libXext-devel
 Requires: libGL-devel
 Requires: libGLU-devel
-Requires: libXt-devel libXrender-devel libXrandr-devel
+Requires: libXrender-devel
+Requires: libXrandr-devel
 
 %description devel
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -50,11 +56,13 @@
 %patch19 -p1 -b .preferalsa
 %patch20 -p1 -b .pagesize
 %patch21 -p1 -b .multilib
+%patch22 -p1 -b .fixman
+%patch23 -p1 -b .dynamic-esd
 
 %build
 aclocal
 autoconf
-CFLAGS="$RPM_OPT_FLAGS -O3" CXXFLAGS="$RPM_OPT_FLAGS -O3" \
+CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
 %configure \
    --disable-video-svga --disable-video-ggi --disable-video-aalib \
    --disable-debug \
@@ -64,14 +72,12 @@
    --enable-esd-shared \
    --enable-alsa \
    --disable-rpath \
-   --x-includes=/usr/include --x-libraries=/usr/%{_lib}
-export tagname=CC
+   --x-includes=%{_includedir} --x-libraries=%{_libdir}
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 
-export tagname=CC
 make install DESTDIR=%{buildroot}
 
 # Rename SDL_config.h to SDL_config-<arch>.h to avoid file conflicts on
@@ -107,11 +113,22 @@
 %{_bindir}/*-config
 %{_libdir}/lib*.so
 %{_libdir}/*a
+%{_libdir}/pkgconfig/sdl.pc
 %{_includedir}/SDL
 %{_datadir}/aclocal/*
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Mon Mar 19 2007 Thomas Woerner <twoerner at redhat.com> 1.2.11-1
+- new version 1.2.11
+- fixed man page SDL_ListModes (rhbz#208212)
+- fixed spurious esound, audiofile dependencies (rhbz#217389)
+  Thanks to Ville Skyttä for the patch
+- dropped requirements for imake and libXt-devel (rhbz#226402)
+- made nasm arch %%{ix86} only (rhbz#226402)
+- dropped O3 from options (rhbz#226402)
+- dropped tagname environment variable (rhbz#226402)
+
 * Thu Nov  2 2006 Thomas Woerner <twoerner at redhat.com> 1.2.10-9
 - fixed arch order in SDL_config.h wrapper
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	19 May 2006 09:25:06 -0000	1.13
+++ sources	19 Mar 2007 17:54:55 -0000	1.14
@@ -1 +1 @@
-b7b46a866b8bf32df8c041a00e567c7d  SDL-1.2.10.tar.gz
+418b42956b7cd103bfab1b9077ccc149  SDL-1.2.11.tar.gz

More information about the fedora-cvs-commits mailing list