Author: goetz
Date: Wed Jan 31 11:26:48 2007
New Revision: 115662
Added:
packages/cooker/libmikmod/current/SOURCES/libmikmod-3.1.11-esd-driver.patch
Modified:
packages/cooker/libmikmod/current/SPECS/libmikmod.spec
Log:
fix esd driver
Added:
packages/cooker/libmikmod/current/SOURCES/libmikmod-3.1.11-esd-driver.patch
==============================================================================
--- (empty file)
+++ packages/cooker/libmikmod/current/SOURCES/libmikmod-3.1.11-esd-driver.patch
Wed Jan 31 11:26:48 2007
@@ -0,0 +1,15 @@
+Bug #163938: Change the library name dlopen uses to libesd.so.0, since we hard
+depend on libesd0-dev. Probably this should be integrated into autoconf?
+
+diff -Ndurp libmikmod-3.1.10.orig/drivers/drv_esd.c
libmikmod-3.1.10/drivers/drv_esd.c
+--- libmikmod-3.1.10.orig/drivers/drv_esd.c 2002-01-12 19:00:36.000000000
+0100
++++ libmikmod-3.1.10/drivers/drv_esd.c 2003-01-22 18:03:37.000000000 +0100
+@@ -100,7 +100,7 @@ static BOOL ESD_Link(void)
+ if (libesd) return 0;
+
+ /* load libesd.so */
+- libesd=dlopen("libesd.so",RTLD_LAZY|RTLD_GLOBAL);
++ libesd=dlopen("libesd.so.0",RTLD_LAZY|RTLD_GLOBAL);
+ if (!libesd) return 1;
+
+ /* resolve function references */
Modified: packages/cooker/libmikmod/current/SPECS/libmikmod.spec
==============================================================================
--- packages/cooker/libmikmod/current/SPECS/libmikmod.spec (original)
+++ packages/cooker/libmikmod/current/SPECS/libmikmod.spec Wed Jan 31
11:26:48 2007
@@ -1,6 +1,6 @@
%define name libmikmod
%define version 3.1.11a
-%define release %mkrel 5
+%define release %mkrel 6
%define major 2
%define libname %mklibname mikmod %{major}
@@ -17,6 +17,8 @@
Patch5: libmikmod-3.1.11-new-alsa-fix.patch
Patch6: libmikmod-3.1.11-a.patch
Patch7: libmikmod-sprintf.patch
+#gw dlopen libesd.so.0 instead of libesd.so
+Patch8: libmikmod-3.1.11-esd-driver.patch
License: LGPL
Group: Sound
URL: http://mikmod.raphnet.net/
@@ -92,6 +94,7 @@
%patch3 -p1 -b .rawwriter_path
%patch5 -p1 -b .alsa
%patch7 -p1 -b .sprintf
+%patch8 -p1 -b .esd
rm -f configure
aclocal-1.8
autoconf
