diff --git a/SDL-1.2.11-x11dyn64.patch b/SDL-1.2.11-x11dyn64.patch new file mode 100644 index 0000000..955cf7f --- /dev/null +++ b/SDL-1.2.11-x11dyn64.patch @@ -0,0 +1,12 @@ +--- SDL-1.2.11/configure.in.x11dyn64 2007-03-20 15:16:43.000000000 +0100 ++++ SDL-1.2.11/configure.in 2007-03-20 15:17:19.000000000 +0100 +@@ -857,7 +857,8 @@ + ;; + *) + x11_lib_spec=[`echo $X_LIBS | sed 's/.*-L\([^ ]*\).*/\1/'`] +- for path in $x11_lib_path /usr/lib /usr/X11/lib /usr/X11R6/lib; do ++ pfx=${libdir##*/} ++ for path in $x_libraries /usr/${pfx} /usr/X11/${pfx} /usr/X11R6/${pfx}; do + if test "x$x11_lib" = "x"; then + x11_lib=[`ls -- $path/libX11.so.[0-9] 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`] + if test "x$x11_lib" = "x"; then diff --git a/SDL.spec b/SDL.spec index 2aaa9ed..aed6c40 100644 --- a/SDL.spec +++ b/SDL.spec @@ -1,7 +1,7 @@ Summary: A cross-platform multimedia library Name: SDL Version: 1.2.11 -Release: 1 +Release: 2 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz Source2: SDL_config.h Patch0: SDL-1.2.10-byteorder.patch @@ -11,6 +11,7 @@ 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 +Patch24: SDL-1.2.11-x11dyn64.patch URL: http://www.libsdl.org/ License: LGPL Group: System Environment/Libraries @@ -58,6 +59,7 @@ rm -rf %{buildroot} %patch21 -p1 -b .multilib %patch22 -p1 -b .fixman %patch23 -p1 -b .dynamic-esd +%patch24 -p1 -b .x11dyn64 %build aclocal @@ -71,8 +73,7 @@ CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ --enable-arts-shared \ --enable-esd-shared \ --enable-alsa \ - --disable-rpath \ - --x-includes=%{_includedir} --x-libraries=%{_libdir} + --disable-rpath make %{?_smp_mflags} %install @@ -119,6 +120,9 @@ rm -rf %{buildroot} %{_mandir}/man3/SDL*.3* %changelog +* Tue Mar 20 2007 Thomas Woerner 1.2.11-2 +- use X11 dlopen code for 64 bit architectures (rhbz#207903) + * Mon Mar 19 2007 Thomas Woerner 1.2.11-1 - new version 1.2.11 - fixed man page SDL_ListModes (rhbz#208212)