diff options
| -rw-r--r-- | multimedia/libxine/Makefile | 6 | ||||
| -rw-r--r-- | multimedia/libxine/files/patch-src:input:Makefile.in | 41 |
2 files changed, 45 insertions, 2 deletions
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index b2056d6f9fe0..1faa67b2e666 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -7,6 +7,7 @@ PORTNAME= xine PORTVERSION= 1.0.b9 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -25,7 +26,8 @@ LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \ SDL-1.1.5:${PORTSDIR}/devel/sdl12 \ vorbis.2:${PORTSDIR}/audio/libvorbis \ ogg.4:${PORTSDIR}/audio/libogg \ - mng.1:${PORTSDIR}/graphics/libmng + mng.1:${PORTSDIR}/graphics/libmng \ + dvdread.3:${PORTSDIR}/multimedia/libdvdread USE_X_PREFIX= yes GNU_CONFIGURE= yes @@ -35,7 +37,7 @@ USE_GNOME= gnomehack USE_GMAKE= yes USE_MESA= yes USE_REINPLACE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" \ THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/multimedia/libxine/files/patch-src:input:Makefile.in b/multimedia/libxine/files/patch-src:input:Makefile.in new file mode 100644 index 000000000000..7a5c1cf5c1a8 --- /dev/null +++ b/multimedia/libxine/files/patch-src:input:Makefile.in @@ -0,0 +1,41 @@ +--- src/input/Makefile.in.orig Wed Mar 26 00:50:17 2003 ++++ src/input/Makefile.in Wed Mar 26 00:59:08 2003 +@@ -213,8 +213,8 @@ + + EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c input_rtp.c + +-@HAVE_DVDNAV_TRUE@SUBDIRS = dvb libreal librtsp libdvdread +-@HAVE_DVDNAV_FALSE@SUBDIRS = dvb libreal librtsp libdvdread libdvdnav ++@HAVE_DVDNAV_TRUE@SUBDIRS = dvb libreal librtsp ++@HAVE_DVDNAV_FALSE@SUBDIRS = dvb libreal librtsp libdvdnav + XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la + + +@@ -233,15 +233,13 @@ + + # For DVD + @HAVE_DVDNAV_TRUE@DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ +-@HAVE_DVDNAV_TRUE@ $(DVDNAV_CFLAGS) \ +-@HAVE_DVDNAV_TRUE@ -I$(top_srcdir)/src/input/libdvdread/ ++@HAVE_DVDNAV_TRUE@ $(DVDNAV_CFLAGS) + + @HAVE_DVDNAV_FALSE@DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ +-@HAVE_DVDNAV_FALSE@ -I$(top_srcdir)/src/input/libdvdnav/ \ +-@HAVE_DVDNAV_FALSE@ -I$(top_srcdir)/src/input/libdvdread/ ++@HAVE_DVDNAV_FALSE@ -I$(top_srcdir)/src/input/libdvdnav/ + + @HAVE_DVDNAV_TRUE@link_dvdnav = $(DVDNAV_LIBS) +-@HAVE_DVDNAV_FALSE@link_dvdnav = libdvdnav/libdvdnav.la libdvdread/libdvdread.la ++@HAVE_DVDNAV_FALSE@link_dvdnav = libdvdnav/libdvdnav.la -ldvdread + + AM_CFLAGS = $(GNOME_VFS_CFLAGS) $(DVD_CFLAGS) @ANSI_FLAGS@ + +@@ -355,7 +353,7 @@ + @HAVE_DVDNAV_FALSE@xineplug_inp_dvd_la_DEPENDENCIES = \ + @HAVE_DVDNAV_FALSE@ $(top_builddir)/src/xine-engine/libxine.la \ + @HAVE_DVDNAV_FALSE@ libdvdnav/libdvdnav.la \ +-@HAVE_DVDNAV_FALSE@ libdvdread/libdvdread.la ++@HAVE_DVDNAV_FALSE@ -ldvdread + am_xineplug_inp_dvd_la_OBJECTS = input_dvd.lo + xineplug_inp_dvd_la_OBJECTS = $(am_xineplug_inp_dvd_la_OBJECTS) + xineplug_inp_file_la_DEPENDENCIES = \ |