| 1 |
ssuominen 10/02/03 10:39:58 |
| 2 |
|
| 3 |
Added: dvbstreamer-1.1-libtool.patch |
| 4 |
Log: |
| 5 |
Use system libtool wrt #252404, thanks to Diego E. 'Flameeyes' Pettenò for reporting. |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-tv/dvbstreamer/files/dvbstreamer-1.1-libtool.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/dvbstreamer/files/dvbstreamer-1.1-libtool.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/dvbstreamer/files/dvbstreamer-1.1-libtool.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: dvbstreamer-1.1-libtool.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur dvbstreamer-1.1.orig/configure.in dvbstreamer-1.1/configure.in |
| 17 |
--- dvbstreamer-1.1.orig/configure.in 2008-10-31 16:49:00.000000000 +0200 |
| 18 |
+++ dvbstreamer-1.1/configure.in 2010-02-03 12:30:56.000000000 +0200 |
| 19 |
@@ -23,7 +23,6 @@ |
| 20 |
|
| 21 |
AM_INIT_AUTOMAKE("dvbstreamer", $SPEC_VERSION) |
| 22 |
|
| 23 |
-AC_CONFIG_SUBDIRS(libltdl) |
| 24 |
AM_CONFIG_HEADER(config.h) |
| 25 |
|
| 26 |
AC_ISC_POSIX |
| 27 |
@@ -35,12 +34,8 @@ |
| 28 |
dnl --------------------------------------------------------------------------- |
| 29 |
dnl Libltdl setup |
| 30 |
dnl --------------------------------------------------------------------------- |
| 31 |
-AC_LIBTOOL_WIN32_DLL dnl Make sure under cygwin we can load plugins !!! |
| 32 |
-AC_LIBTOOL_DLOPEN |
| 33 |
-AC_LIBLTDL_CONVENIENCE |
| 34 |
-AC_PROG_LIBTOOL |
| 35 |
-AC_SUBST(INCLTDL) |
| 36 |
-AC_SUBST(LIBLTDL) |
| 37 |
+LT_PREREQ([2.2.6]) |
| 38 |
+LT_INIT([dlopen win32-dll disable-static]) |
| 39 |
|
| 40 |
dnl --------------------------------------------------------------------------- |
| 41 |
dnl Work out the libdir name (copied from xine-lib configure.ac) |
| 42 |
diff -ur dvbstreamer-1.1.orig/Makefile.am dvbstreamer-1.1/Makefile.am |
| 43 |
--- dvbstreamer-1.1.orig/Makefile.am 2008-10-31 16:25:03.000000000 +0200 |
| 44 |
+++ dvbstreamer-1.1/Makefile.am 2010-02-03 12:25:57.000000000 +0200 |
| 45 |
@@ -1,6 +1,6 @@ |
| 46 |
## DVBStreamer main Makefile |
| 47 |
|
| 48 |
-SUBDIRS = libltdl include include/dvbpsi src/dvbpsi src src/plugins |
| 49 |
+SUBDIRS = include include/dvbpsi src/dvbpsi src src/plugins |
| 50 |
|
| 51 |
dvbstreamerdocdir = ${prefix}/doc/DVBStreamer |
| 52 |
dvbstreamerdoc_DATA = \ |
| 53 |
diff -ur dvbstreamer-1.1.orig/src/Makefile.am dvbstreamer-1.1/src/Makefile.am |
| 54 |
--- dvbstreamer-1.1.orig/src/Makefile.am 2008-10-31 16:25:02.000000000 +0200 |
| 55 |
+++ dvbstreamer-1.1/src/Makefile.am 2010-02-03 12:33:30.000000000 +0200 |
| 56 |
@@ -1,7 +1,5 @@ |
| 57 |
## Process this file with automake to produce Makefile.in |
| 58 |
|
| 59 |
-INCLUDES = @INCLTDL@ |
| 60 |
- |
| 61 |
AM_CFLAGS =\ |
| 62 |
-I$(top_srcdir)/include -Wall -Werror -D_GNU_SOURCE |
| 63 |
|
| 64 |
@@ -104,7 +102,7 @@ |
| 65 |
dvbstreamer_LDFLAGS = -rdynamic -Wl,-whole-archive -Wl,dvbpsi/libdvbpsi.a -Wl,-no-whole-archive |
| 66 |
|
| 67 |
dvbstreamer_LDADD = \ |
| 68 |
- -lpthread -lsqlite3 -lreadline @GETTIME_LIB@ @ICONV_LIB@ @READLINE_TERMCAP@ @LIBLTDL@ |
| 69 |
+ -lpthread -lsqlite3 -lreadline @GETTIME_LIB@ @ICONV_LIB@ @READLINE_TERMCAP@ -lltdl |
| 70 |
|
| 71 |
# |
| 72 |
# dvbctrl |
| 73 |
diff -ur dvbstreamer-1.1.orig/src/pluginmgr.c dvbstreamer-1.1/src/pluginmgr.c |
| 74 |
--- dvbstreamer-1.1.orig/src/pluginmgr.c 2008-10-31 16:25:02.000000000 +0200 |
| 75 |
+++ dvbstreamer-1.1/src/pluginmgr.c 2010-02-03 12:27:53.000000000 +0200 |
| 76 |
@@ -22,9 +22,9 @@ |
| 77 |
*/ |
| 78 |
#include <stdlib.h> |
| 79 |
#include <string.h> |
| 80 |
+#include <ltdl.h> |
| 81 |
|
| 82 |
#include "config.h" |
| 83 |
-#include "ltdl.h" |
| 84 |
#include "list.h" |
| 85 |
#include "deliverymethod.h" |
| 86 |
#include "patprocessor.h" |
Archives