[Midnightbsd-cvs] mports: multimedia/libxine: Update to 1.1.11.1 Fack fixes.
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Sun Apr 13 16:32:42 EDT 2008
Log Message:
-----------
Update to 1.1.11.1
Fack fixes.
License.
Move all the knobs to OPTIONS.
Modified Files:
--------------
mports/multimedia/libxine:
Makefile (r1.9 -> r1.10)
distinfo (r1.3 -> r1.4)
pkg-plist (r1.4 -> r1.5)
mports/multimedia/libxine/files:
patch-configure (r1.2 -> r1.3)
patch-src_audio_out_audio_oss_out.c (r1.1 -> r1.2)
Added Files:
-----------
mports/multimedia/libxine/files:
patch-misc_libxine.pc.in (r1.1)
patch-src_libffmpeg_libavcodec_dsputil.c (r1.1)
patch-src_libreal_real_common.c (r1.1)
patch-src_libreal_xine_real_audio_decoder.c (r1.1)
Removed Files:
-------------
mports/multimedia/libxine/files:
patch-src:libreal:audio_decoder.c
patch-src:libreal:xine_decoder.c
patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h
patch-src_input_input_vcd.c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/multimedia/libxine/pkg-plist,v
retrieving revision 1.4
retrieving revision 1.5
diff -L multimedia/libxine/pkg-plist -L multimedia/libxine/pkg-plist -u -r1.4 -r1.5
--- multimedia/libxine/pkg-plist
+++ multimedia/libxine/pkg-plist
@@ -40,113 +40,119 @@
lib/libxine.la
lib/libxine.so
lib/libxine.so.1
-lib/xine/plugins/1.1.4/post/xineplug_post_audio_filters.so
-lib/xine/plugins/1.1.4/post/xineplug_post_goom.so
-lib/xine/plugins/1.1.4/post/xineplug_post_mosaico.so
-lib/xine/plugins/1.1.4/post/xineplug_post_planar.so
-lib/xine/plugins/1.1.4/post/xineplug_post_switch.so
-lib/xine/plugins/1.1.4/post/xineplug_post_tvtime.so
-lib/xine/plugins/1.1.4/post/xineplug_post_visualizations.so
- at exec mkdir -p %D/lib/xine/plugins/1.1.4/vidix
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/cyberblade_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mach64_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mga_crtc2_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mga_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/nvidia_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/pm2_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/pm3_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/radeon_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/rage128_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/savage_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/sis_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/unichrome_vid.so
-%%WITH_ARTS%%lib/xine/plugins/1.1.4/xineplug_ao_out_arts.so
-%%WITH_ESOUND%%lib/xine/plugins/1.1.4/xineplug_ao_out_esd.so
-%%WITH_JACK%%lib/xine/plugins/1.1.4/xineplug_ao_out_jack.so
-lib/xine/plugins/1.1.4/xineplug_ao_out_file.so
-lib/xine/plugins/1.1.4/xineplug_ao_out_none.so
-lib/xine/plugins/1.1.4/xineplug_ao_out_oss.so
-%%WITH_PULSEAUDIO%%lib/xine/plugins/1.1.4/xineplug_ao_out_pulseaudio.so
-lib/xine/plugins/1.1.4/xineplug_decode_a52.so
-lib/xine/plugins/1.1.4/xineplug_decode_bitplane.so
-lib/xine/plugins/1.1.4/xineplug_decode_dts.so
-lib/xine/plugins/1.1.4/xineplug_decode_dvaudio.so
-lib/xine/plugins/1.1.4/xineplug_decode_faad.so
-lib/xine/plugins/1.1.4/xineplug_decode_ff.so
-%%WITH_GTK2%%lib/xine/plugins/1.1.4/xineplug_decode_gdk_pixbuf.so
-lib/xine/plugins/1.1.4/xineplug_decode_gsm610.so
-%%WITH_IMAGEMAGICK%%lib/xine/plugins/1.1.4/xineplug_decode_image.so
-lib/xine/plugins/1.1.4/xineplug_decode_lpcm.so
-lib/xine/plugins/1.1.4/xineplug_decode_mad.so
-lib/xine/plugins/1.1.4/xineplug_decode_mpc.so
-lib/xine/plugins/1.1.4/xineplug_decode_mpeg2.so
-lib/xine/plugins/1.1.4/xineplug_decode_nsf.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_decode_qt.so
-lib/xine/plugins/1.1.4/xineplug_decode_real.so
-lib/xine/plugins/1.1.4/xineplug_decode_real_audio.so
-lib/xine/plugins/1.1.4/xineplug_decode_rgb.so
-lib/xine/plugins/1.1.4/xineplug_decode_speex.so
-lib/xine/plugins/1.1.4/xineplug_decode_spu.so
-lib/xine/plugins/1.1.4/xineplug_decode_spucc.so
-lib/xine/plugins/1.1.4/xineplug_decode_spucmml.so
-lib/xine/plugins/1.1.4/xineplug_decode_spudvb.so
-lib/xine/plugins/1.1.4/xineplug_decode_sputext.so
-lib/xine/plugins/1.1.4/xineplug_decode_theora.so
-lib/xine/plugins/1.1.4/xineplug_decode_vorbis.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_decode_w32dll.so
-lib/xine/plugins/1.1.4/xineplug_decode_yuv.so
-lib/xine/plugins/1.1.4/xineplug_dmx_asf.so
-lib/xine/plugins/1.1.4/xineplug_dmx_audio.so
-lib/xine/plugins/1.1.4/xineplug_dmx_avi.so
-lib/xine/plugins/1.1.4/xineplug_dmx_fli.so
-lib/xine/plugins/1.1.4/xineplug_dmx_flv.so
-lib/xine/plugins/1.1.4/xineplug_dmx_games.so
-lib/xine/plugins/1.1.4/xineplug_dmx_iff.so
-%%WITH_DMX_IMAGE%%lib/xine/plugins/1.1.4/xineplug_dmx_image.so
-lib/xine/plugins/1.1.4/xineplug_dmx_matroska.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mng.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/1.1.4/xineplug_dmx_nsv.so
-lib/xine/plugins/1.1.4/xineplug_dmx_ogg.so
-lib/xine/plugins/1.1.4/xineplug_dmx_pva.so
-lib/xine/plugins/1.1.4/xineplug_dmx_qt.so
-lib/xine/plugins/1.1.4/xineplug_dmx_rawdv.so
-lib/xine/plugins/1.1.4/xineplug_dmx_real.so
-lib/xine/plugins/1.1.4/xineplug_dmx_slave.so
-lib/xine/plugins/1.1.4/xineplug_dmx_sputext.so
-lib/xine/plugins/1.1.4/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/1.1.4/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/1.1.4/xineplug_flac.so
-lib/xine/plugins/1.1.4/xineplug_inp_cdda.so
-lib/xine/plugins/1.1.4/xineplug_inp_dvb.so
-lib/xine/plugins/1.1.4/xineplug_inp_dvd.so
-lib/xine/plugins/1.1.4/xineplug_inp_file.so
-%%WITH_GNOMEVFS2%%lib/xine/plugins/1.1.4/xineplug_inp_gnome_vfs.so
-lib/xine/plugins/1.1.4/xineplug_inp_http.so
-lib/xine/plugins/1.1.4/xineplug_inp_mms.so
-lib/xine/plugins/1.1.4/xineplug_inp_net.so
-lib/xine/plugins/1.1.4/xineplug_inp_pnm.so
-lib/xine/plugins/1.1.4/xineplug_inp_rtp.so
-lib/xine/plugins/1.1.4/xineplug_inp_rtsp.so
-%%WITH_SMB%%lib/xine/plugins/1.1.4/xineplug_inp_smb.so
-lib/xine/plugins/1.1.4/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/1.1.4/xineplug_inp_vcd.so
-lib/xine/plugins/1.1.4/xineplug_inp_vcdo.so
-%%WITH_AALIB%%lib/xine/plugins/1.1.4/xineplug_vo_out_aa.so
-%%WITH_CACA%%lib/xine/plugins/1.1.4/xineplug_vo_out_caca.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_none.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_opengl.so
- at comment lib/xine/plugins/1.1.4/xineplug_vo_out_sdl.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_vo_out_vidix.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_xshm.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_xv.so
-%%WITH_XVMC%%lib/xine/plugins/1.1.4/xineplug_vo_out_xvmc.so
+%%PLUGINSDIR%%/mime.types
+%%PLUGINSDIR%%/post/xineplug_post_audio_filters.so
+%%PLUGINSDIR%%/post/xineplug_post_goom.so
+%%PLUGINSDIR%%/post/xineplug_post_mosaico.so
+%%PLUGINSDIR%%/post/xineplug_post_planar.so
+%%PLUGINSDIR%%/post/xineplug_post_switch.so
+%%PLUGINSDIR%%/post/xineplug_post_tvtime.so
+%%PLUGINSDIR%%/post/xineplug_post_visualizations.so
+ at exec mkdir -p %D/%%PLUGINSDIR%%/vidix
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/cyberblade_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/mach64_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/mga_crtc2_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/mga_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/nvidia_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/pm2_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/pm3_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/radeon_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/rage128_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/savage_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/sis_vid.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/unichrome_vid.so
+%%WITH_ARTS%%%%PLUGINSDIR%%/xineplug_ao_out_arts.so
+%%WITH_ESOUND%%%%PLUGINSDIR%%/xineplug_ao_out_esd.so
+%%WITH_JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.so
+%%PLUGINSDIR%%/xineplug_ao_out_file.so
+%%PLUGINSDIR%%/xineplug_ao_out_none.so
+%%PLUGINSDIR%%/xineplug_ao_out_oss.so
+%%WITH_PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
+%%PLUGINSDIR%%/xineplug_decode_a52.so
+%%PLUGINSDIR%%/xineplug_decode_bitplane.so
+%%PLUGINSDIR%%/xineplug_decode_dts.so
+%%PLUGINSDIR%%/xineplug_decode_dvaudio.so
+%%PLUGINSDIR%%/xineplug_decode_faad.so
+%%PLUGINSDIR%%/xineplug_decode_ff.so
+%%WITH_GTK2%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so
+%%PLUGINSDIR%%/xineplug_decode_gsm610.so
+%%WITH_IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.so
+%%PLUGINSDIR%%/xineplug_decode_lpcm.so
+%%PLUGINSDIR%%/xineplug_decode_mad.so
+%%PLUGINSDIR%%/xineplug_decode_mpc.so
+%%PLUGINSDIR%%/xineplug_decode_mpeg2.so
+%%PLUGINSDIR%%/xineplug_decode_nsf.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_decode_qt.so
+%%PLUGINSDIR%%/xineplug_decode_real.so
+%%PLUGINSDIR%%/xineplug_decode_rgb.so
+%%PLUGINSDIR%%/xineplug_decode_speex.so
+%%PLUGINSDIR%%/xineplug_decode_spu.so
+%%PLUGINSDIR%%/xineplug_decode_spucc.so
+%%PLUGINSDIR%%/xineplug_decode_spucmml.so
+%%PLUGINSDIR%%/xineplug_decode_spudvb.so
+%%PLUGINSDIR%%/xineplug_decode_sputext.so
+%%PLUGINSDIR%%/xineplug_decode_theora.so
+%%PLUGINSDIR%%/xineplug_decode_vorbis.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_decode_w32dll.so
+%%PLUGINSDIR%%/xineplug_decode_yuv.so
+%%PLUGINSDIR%%/xineplug_dmx_asf.so
+%%PLUGINSDIR%%/xineplug_dmx_audio.so
+%%PLUGINSDIR%%/xineplug_dmx_avi.so
+%%PLUGINSDIR%%/xineplug_dmx_fli.so
+%%PLUGINSDIR%%/xineplug_dmx_flv.so
+%%PLUGINSDIR%%/xineplug_dmx_games.so
+%%PLUGINSDIR%%/xineplug_dmx_iff.so
+%%WITH_DMX_IMAGE%%%%PLUGINSDIR%%/xineplug_dmx_image.so
+%%PLUGINSDIR%%/xineplug_dmx_matroska.so
+%%PLUGINSDIR%%/xineplug_dmx_mng.so
+%%PLUGINSDIR%%/xineplug_dmx_mpeg.so
+%%PLUGINSDIR%%/xineplug_dmx_mpeg_block.so
+%%PLUGINSDIR%%/xineplug_dmx_mpeg_elem.so
+%%PLUGINSDIR%%/xineplug_dmx_mpeg_pes.so
+%%PLUGINSDIR%%/xineplug_dmx_mpeg_ts.so
+%%PLUGINSDIR%%/xineplug_dmx_nsv.so
+%%PLUGINSDIR%%/xineplug_dmx_ogg.so
+%%PLUGINSDIR%%/xineplug_dmx_pva.so
+%%PLUGINSDIR%%/xineplug_dmx_qt.so
+%%PLUGINSDIR%%/xineplug_dmx_rawdv.so
+%%PLUGINSDIR%%/xineplug_dmx_real.so
+%%PLUGINSDIR%%/xineplug_dmx_slave.so
+%%PLUGINSDIR%%/xineplug_dmx_sputext.so
+%%PLUGINSDIR%%/xineplug_dmx_yuv4mpeg2.so
+%%PLUGINSDIR%%/xineplug_dmx_yuv_frames.so
+%%PLUGINSDIR%%/xineplug_flac.so
+%%PLUGINSDIR%%/xineplug_inp_cdda.so
+%%PLUGINSDIR%%/xineplug_inp_dvb.so
+%%PLUGINSDIR%%/xineplug_inp_dvd.so
+%%PLUGINSDIR%%/xineplug_inp_file.so
+%%WITH_GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so
+%%PLUGINSDIR%%/xineplug_inp_http.so
+%%PLUGINSDIR%%/xineplug_inp_mms.so
+%%PLUGINSDIR%%/xineplug_inp_net.so
+%%PLUGINSDIR%%/xineplug_inp_pnm.so
+%%PLUGINSDIR%%/xineplug_inp_rtp.so
+%%PLUGINSDIR%%/xineplug_inp_rtsp.so
+%%WITH_SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.so
+%%PLUGINSDIR%%/xineplug_inp_stdin_fifo.so
+%%PLUGINSDIR%%/xineplug_inp_vcd.so
+%%PLUGINSDIR%%/xineplug_inp_vcdo.so
+%%WITH_AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so
+%%WITH_CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so
+%%PLUGINSDIR%%/xineplug_vo_out_none.so
+%%PLUGINSDIR%%/xineplug_vo_out_opengl.so
+%%PLUGINSDIR%%/xineplug_vo_out_sdl.so
+%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_vo_out_vidix.so
+%%PLUGINSDIR%%/xineplug_vo_out_xshm.so
+%%PLUGINSDIR%%/xineplug_vo_out_xv.so
+%%WITH_XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xvmc.so
+%%WITH_XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xxmc.so
+%%WITH_WAVPACK%%%%PLUGINSDIR%%/xineplug_wavpack.so
libdata/pkgconfig/libxine.pc
share/aclocal/xine.m4
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/CREDITS
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/NEWS
%%DOCSDIR%%/README
%%DOCSDIR%%/README.MINGWCROSS
%%DOCSDIR%%/README.WIN32
@@ -159,6 +165,7 @@
%%DOCSDIR%%/README.solaris
%%DOCSDIR%%/README.syncfb
%%DOCSDIR%%/README_xxmc.html
+%%DOCSDIR%%/TODO
%%DOCSDIR%%/faq.html
%%DOCSDIR%%/faq.txt
%%DOCSDIR%%/hackersguide/architecture.png
@@ -168,6 +175,7 @@
%%DOCSDIR%%/hackersguide/post_frame.png
share/locale/cs/LC_MESSAGES/libxine1.mo
share/locale/de/LC_MESSAGES/libxine1.mo
+share/locale/eo/LC_MESSAGES/libxine1.mo
share/locale/es/LC_MESSAGES/libxine1.mo
share/locale/eu/LC_MESSAGES/libxine1.mo
share/locale/fr/LC_MESSAGES/libxine1.mo
@@ -175,6 +183,7 @@
share/locale/pl/LC_MESSAGES/libxine1.mo
share/locale/pt_BR/LC_MESSAGES/libxine1.mo
share/locale/sk/LC_MESSAGES/libxine1.mo
+share/locale/tr/LC_MESSAGES/libxine1.mo
%%DATADIR%%/libxine1/fonts/cc-16.xinefont.gz
%%DATADIR%%/libxine1/fonts/cc-20.xinefont.gz
%%DATADIR%%/libxine1/fonts/cc-24.xinefont.gz
@@ -212,9 +221,9 @@
%%DATADIR%%/libxine1/fonts/serif-48.xinefont.gz
%%DATADIR%%/libxine1/fonts/serif-64.xinefont.gz
@dirrm include/xine
- at dirrm lib/xine/plugins/1.1.4/vidix
- at dirrm lib/xine/plugins/1.1.4/post
- at dirrm lib/xine/plugins/1.1.4
+ at dirrm %%PLUGINSDIR%%/vidix
+ at dirrm %%PLUGINSDIR%%/post
+ at dirrm %%PLUGINSDIR%%
@dirrm lib/xine/plugins
@dirrm lib/xine
@dirrm %%DOCSDIR%%/hackersguide
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/multimedia/libxine/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -L multimedia/libxine/Makefile -L multimedia/libxine/Makefile -u -r1.9 -r1.10
--- multimedia/libxine/Makefile
+++ multimedia/libxine/Makefile
@@ -2,13 +2,12 @@
# Date created: 14 Oct 2000
# Whom: alex
#
+# $FreeBSD: ports/multimedia/libxine/Makefile,v 1.127 2008/04/08 09:38:56 mich Exp $
# $MidnightBSD$
-# $FreeBSD: ports/multimedia/libxine/Makefile,v 1.107 2007/02/23 22:51:10 mezz Exp $
#
PORTNAME= xine
-PORTVERSION= 1.1.4
-PORTREVISION= 2
+PORTVERSION= 1.1.11.1
CATEGORIES= multimedia ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,8 +16,8 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Libraries for xine multimedia player
+LICENSE= gpl2
-BUILD_DEPENDS= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
LIB_DEPENDS= FLAC.7:${PORTSDIR}/audio/flac \
vorbis.4:${PORTSDIR}/audio/libvorbis \
speex.1:${PORTSDIR}/audio/speex \
@@ -31,12 +30,13 @@
modplug.0:${PORTSDIR}/audio/libmodplug \
vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
theora.0:${PORTSDIR}/multimedia/libtheora \
- mad.2:${PORTSDIR}/audio/libmad
+ mad.2:${PORTSDIR}/audio/libmad \
+ dca.0:${PORTSDIR}/multimedia/libdca
+USE_BZIP2= yes
USE_GCC= 3.4+
USE_GETTEXT= yes
USE_ICONV= yes
-USE_XLIB= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
WANT_GNOME= yes
@@ -45,6 +45,9 @@
USE_GL= yes
USE_SDL= sdl
USE_LDCONFIG= yes
+# built in libtool is very old and doesn't work with fake.
+USE_AUTOTOOLS= libtool:15
+
CONFIGURE_ENV= CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${X11BASE}/include" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
@@ -52,38 +55,50 @@
THREAD_LIBS="${PTHREAD_LIBS}" \
EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm"
CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 --enable-ipv6 \
- --mandir=${PREFIX}/man --with-external-libmad \
- --with-external-libdts --with-libflac --disable-v4l \
- --build=${ARCH}-portbld-freebsd6.0
+ --with-external-libmad \
+ --with-external-libdts --with-libflac --disable-v4l
+
+
+
+OPTIONS= ARTS "Enable aRts support" off \
+ CACA "Enable libcaca support" off \
+ ESOUND "Enable EsounD support" off \
+ JACK "Enable JACK support" off \
+ GNOMEVFS2 "Enable GnomeVFS2 support" off \
+ PULSEAUDIO "Enable PulseAudio support" off \
+ XVMC "Enable XvMC support" off \
+ SMB "Enable SMB protocol support" off \
+ AALIB "Enable aalib support" off \
+ IMAGEMAGICK "Enable ImageMagick support" off \
+ GTK2 "Enable gdkpixbuf support" off \
+ WAVPACK "Enable WavPack support" on
MAN1= xine-config.1
MAN5= xine.5
-DOCSDIR= ${TARGETDIR}/share/doc/xine-lib
+DOCSDIR= ${PREFIX}/share/doc/xine-lib
+PLIST_SUB= PLUGINSDIR="lib/xine/plugins/1.20"
.include <bsd.port.pre.mk>
-.if ${ARCH} == amd64
-USE_GCC= 4.1+
-.endif
-
-.if !defined(WITHOUT_ARTS) && (exists(${LOCALBASE}/bin/artsc-config) || defined(WITH_ARTS))
+.if defined(WITH_ARTS)
LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
PLIST_SUB+= WITH_ARTS=""
+CONFIGURE_ARGS+= --with-arts --enable-artstest
.else
PLIST_SUB+= WITH_ARTS="@comment "
CONFIGURE_ARGS+= --disable-arts --disable-artstest
.endif
-.if !defined(WITHOUT_CACA) && (exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_CACA))
-BUILD_DEPENDS+= caca-config:${PORTSDIR}/graphics/libcaca
+.if defined(WITH_CACA)
+LIB_DEPENDS+= caca.0:${PORTSDIR}/graphics/libcaca
PLIST_SUB+= WITH_CACA=""
.else
PLIST_SUB+= WITH_CACA="@comment "
-CONFIGURE_ARGS+= --disable-caca --disable-cacatest
+CONFIGURE_ARGS+= --without-caca --disable-cacatest
.endif
-.if !defined(WITHOUT_ESOUND) && (${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND))
+.if defined(WITH_ESOUND)
USE_GNOME+= esound
PLIST_SUB+= WITH_ESOUND=""
.else
@@ -91,15 +106,15 @@
CONFIGURE_ARGS+= --without-esound
.endif
-.if !defined(WITHOUT_JACK) && (exists(${LOCALBASE}/lib/libjack.so) || defined(WITH_JACK))
+.if defined(WITH_JACK)
LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
PLIST_SUB+= WITH_JACK=""
.else
PLIST_SUB+= WITH_JACK="@comment "
-CONFIGURE_ARGS+= --disable-jack
+CONFIGURE_ARGS+= --without-jack
.endif
-.if !defined(WITHOUT_GNOMEVFS2) && (${HAVE_GNOME:Mgnomevfs2} != "" || defined(WITH_GNOMEVFS2))
+.if defined(WITH_GNOMEVFS2)
USE_GNOME+= gnomevfs2
PLIST_SUB+= WITH_GNOMEVFS2=""
.else
@@ -107,23 +122,29 @@
CONFIGURE_ARGS+= --disable-gnomevfs
.endif
-.if !defined(WITHOUT_PULSEAUDIO) && (exists(${LOCALBASE}/lib/libpulse.so.0) || defined(WITH_PULSEAUDIO))
+.if defined(WITH_PULSEAUDIO)
LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
PLIST_SUB+= WITH_PULSEAUDIO=""
.else
PLIST_SUB+= WITH_PULSEAUDIO="@comment "
-CONFIGURE_ARGS+= --disable-pulseaudio
+CONFIGURE_ARGS+= --without-pulseaudio
.endif
-.if !defined(WITHOUT_XVMC) && (exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) || defined(WITH_XVMC))
-CONFIGURE_ARGS+=--with-xvmc-lib=XvMCNVIDIA
+.if defined(WITH_XVMC)
+.if defined(WITH_NVIDIA_GL) || exists(${X11BASE}/lib/libXvMCNVIDIA.so.1)
+CONFIGURE_ARGS+= --with-xvmc-lib=XvMCNVIDIA
LIB_DEPENDS+= XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver
+.else
+CONFIGURE_ARGS+= --with-xvmc-lib=XvMCW
+LIB_DEPENDS+= XvMC.1:${PORTSDIR}/x11/libXvMC
+.endif
PLIST_SUB+= WITH_XVMC=""
.else
+CONFIGURE_ARGS+= --disable-xvmc
PLIST_SUB+= WITH_XVMC="@comment "
.endif
-.if !defined(WITHOUT_SMB) && (exists(${LOCALBASE}/lib/libsmbclient.so.0) || defined (WITH_SMB))
+.if defined(WITH_SMB)
LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient
PLIST_SUB+= WITH_SMB=""
.else
@@ -131,7 +152,7 @@
CONFIGURE_ARGS+= --disable-samba
.endif
-.if !defined(WITHOUT_AALIB) && (exists(${LOCALBASE}/lib/libaa.so.1) || defined (WITH_AALIB))
+.if defined(WITH_AALIB)
LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
PLIST_SUB+= WITH_AALIB=""
.else
@@ -139,15 +160,15 @@
CONFIGURE_ARGS+= --disable-aalib --disable-aalibtest
.endif
-.if !defined(WITHOUT_IMAGEMAGICK) && (exists(${LOCALBASE}/lib/libWand.so.10) || defined (WITH_IMAGEMAGICK))
+.if defined(WITH_IMAGEMAGICK)
LIB_DEPENDS+= Wand.10:${PORTSDIR}/graphics/ImageMagick
PLIST_SUB+= WITH_IMAGEMAGICK=""
.else
PLIST_SUB+= WITH_IMAGEMAGICK="@comment "
-CONFIGURE_ARGS+= --disable-imagemagick
+CONFIGURE_ARGS+= --without-imagemagick
.endif
-.if !defined(WITHOUT_GTK2) && (${HAVE_GNOME:Mgtk20} != "" || defined(WITH_GTK2))
+.if defined(WITH_GTK2)
USE_GNOME+= gtk20
PLIST_SUB+= WITH_GTK2=""
.else
@@ -155,7 +176,16 @@
CONFIGURE_ARGS+= --disable-gdkpixbuf
.endif
-.if ${CONFIGURE_ARGS:M*--disable-imagemagick*} == "" || ${CONFIGURE_ARGS:M*-disable-gdkpixbuf*} == ""
+.if defined(WITH_WAVPACK)
+LIB_DEPENDS+= wavpack.1:${PORTSDIR}/audio/wavpack
+PLIST_SUB+= WITH_WAVPACK=""
+CONFIGURE_ARGS+= --with-wavpack
+.else
+PLIST_SUB+= WITH_WAVPACK="@comment "
+CONFIGURE_ARGS+= --without-wavpack
+.endif
+
+.if ${CONFIGURE_ARGS:M*--without-imagemagick*} == "" || ${CONFIGURE_ARGS:M*-disable-gdkpixbuf*} == ""
PLIST_SUB+= WITH_DMX_IMAGE=""
.else
PLIST_SUB+= WITH_DMX_IMAGE="@comment "
@@ -168,52 +198,6 @@
CONFIGURE_ARGS+= --disable-vidix
.endif
-pre-everything::
- @${ECHO_MSG} "===>"
- @${ECHO_MSG} "===> You can enable some features by defining following variables."
- @${ECHO_MSG} "===>"
-.if !exists(${LOCALBASE}/bin/artsc-config) && !defined(WITH_ARTS) || defined(WITHOUT_ARTS)
- @${ECHO_MSG} "===> WITH_ARTS (arts support)"
-.else
- @${ECHO_MSG} "===> WITH_ARTS (arts support, enabled)"
-.endif
-.if !exists(${LOCALBASE}/lib/libcaca.a) && !defined(WITH_CACA) || defined(WITHOUT_CACA)
- @${ECHO_MSG} "===> WITH_CACA (libcaca support)"
-.else
- @${ECHO_MSG} "===> WITH_CACA (libcaca support, enabled)"
-.endif
-.if !(${HAVE_GNOME:Mgnomevfs2} != "") && !defined(WITH_GNOMEVFS2) || defined(WITHOUT_GNOMEVFS2)
- @${ECHO_MSG} "===> WITH_GNOMEVFS2 (gnomevfs2 support)"
-.else
- @${ECHO_MSG} "===> WITH_GNOMEVFS2 (gnomevfs2 support, enabled)"
-.endif
-.if !(${HAVE_GNOME:Mesound} != "") && !defined(WITH_ESOUND) || defined(WITHOUT_ESOUND)
- @${ECHO_MSG} "===> WITH_ESOUND (esound support)"
-.else
- @${ECHO_MSG} "===> WITH_ESOUND (esound support, enabled)"
-.endif
-.if !exists(${LOCALBASE}/lib/libjack.so) && !defined(WITH_JACK) || defined(WITHOUT_JACK)
- @${ECHO_MSG} "===> WITH_JACK (JACK support)"
-.else
- @${ECHO_MSG} "===> WITH_JACK (JACK support, enabled)"
-.endif
-.if !exists(${LOCALBASE}/lib/libpulse.so.0) && !defined(WITH_PULSEAUDIO) || defined(WITHOUT_PULSEAUDIO)
- @${ECHO_MSG} "===> WITH_PULSEAUDIO (pulseaudio support)"
-.else
- @${ECHO_MSG} "===> WITH_PULSEAUDIO (pulseaudio support, enabled)"
-.endif
-.if !exists(${LOCALBASE}/lib/libsmbclient.so.0) && !defined (WITH_SMB) || defined(WITHOUT_SMB)
- @${ECHO_MSG} "===> WITH_SMB (SMB support)"
-.else
- @${ECHO_MSG} "===> WITH_SMB (SMB support, enabled)"
-.endif
-.if !exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) && !defined(WITH_XVMC) || defined(WITHOUT_XVMC)
- @${ECHO_MSG} "===> WITH_XVMC (XvMC support)"
-.else
- @${ECHO_MSG} "===> WITH_XVMC (XvMC support, enabled)"
-.endif
- @${ECHO_MSG} "===>"
-
post-patch:
.for f in libtool ltmain.sh
@${REINPLACE_CMD} -e \
@@ -224,8 +208,8 @@
pre-configure:
@${REINPLACE_CMD} -e \
- 's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
- s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
+ 's|THREAD_LIBS=".*"|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
+ s|THREAD_CFLAGS=".*"|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
s|-L/usr/local/lib||g ; \
s|-I/usr/local/include||g ; \
s|-lgiconv|-liconv|g ; \
@@ -237,4 +221,7 @@
s|-malign-jumps|-falign-jumps|g ; \
s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure
+pre-build:
+ @${CP} -p ${LOCALBASE}/include/dts.h ${WRKSRC}/src/libdts/
+
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/multimedia/libxine/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L multimedia/libxine/distinfo -L multimedia/libxine/distinfo -u -r1.3 -r1.4
--- multimedia/libxine/distinfo
+++ multimedia/libxine/distinfo
@@ -1,3 +1,3 @@
-MD5 (xine-lib-1.1.4.tar.gz) = 6631bf12e1e9bfc740797e0c56f46be6
-SHA256 (xine-lib-1.1.4.tar.gz) = 1de93c996645c966585a45a622dbaeeaa4b60f866a12b230bae3308209175eab
-SIZE (xine-lib-1.1.4.tar.gz) = 8603909
+MD5 (xine-lib-1.1.11.1.tar.bz2) = 7164410b533b35c0717a819bf251762e
+SHA256 (xine-lib-1.1.11.1.tar.bz2) = fc45fcf7c9ed2d7e7157ae322dbdb3129baedda93ee0e47caee7fe1d55b748ed
+SIZE (xine-lib-1.1.11.1.tar.bz2) = 7409526
--- multimedia/libxine/files/patch-src:libreal:xine_decoder.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/libreal/xine_decoder.c.orig Sun Jul 9 23:39:11 2006
-+++ src/libreal/xine_decoder.c Sun Jul 23 21:41:12 2006
-@@ -47,6 +47,14 @@
- #include "buffer.h"
- #include "xineutils.h"
-
-+#if defined(__FreeBSD__)
-+void ___brk_addr(void) {exit(0);}
-+void __ctype_b(void) {exit(0);}
-+char **__environ={NULL};
-+#undef stderr
-+FILE *stderr=NULL;
-+#endif
-+
- typedef struct {
- video_decoder_class_t decoder_class;
-
-@@ -606,28 +614,14 @@
-
- /* try some auto-detection */
-
-- if (!stat ("/usr/local/RealPlayer8/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/local/RealPlayer8/Codecs";
-- if (!stat ("/usr/RealPlayer8/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/RealPlayer8/Codecs";
-- if (!stat ("/usr/lib/RealPlayer8/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/lib/RealPlayer8/Codecs";
-- if (!stat ("/opt/RealPlayer8/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/opt/RealPlayer8/Codecs";
-- if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/lib/RealPlayer9/users/Real/Codecs";
-- if (!stat ("/usr/lib/RealPlayer10/codecs/drvc.so", &s))
-- default_real_codec_path = "/usr/lib/RealPlayer10/codecs";
-- if (!stat ("/usr/lib64/RealPlayer8/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs";
-- if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs";
-- if (!stat ("/usr/lib64/RealPlayer10/codecs/drvc.so", &s))
-- default_real_codec_path = "/usr/lib64/RealPlayer10/codecs";
-- if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/lib/codecs";
-- if (!stat ("/usr/lib/win32/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/lib/win32";
-+ if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s))
-+ default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs";
-+ if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
-+ default_real_codec_path = "/usr/local/lib/RealPlayer9/users/Real/Codecs";
-+ if (!stat ("/usr/X11R6/lib/RealPlayer/codecs/drvc.so", &s))
-+ default_real_codec_path = "/usr/X11R6/lib/RealPlayer/codecs";
-+ if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s))
-+ default_real_codec_path = "/usr/local/lib/win32";
-
- real_codec_path = config->register_string (config, "decoder.external.real_codecs_path",
- default_real_codec_path,
--- /dev/null
+++ multimedia/libxine/files/patch-src_libffmpeg_libavcodec_dsputil.c
@@ -0,0 +1,11 @@
+--- src/libffmpeg/libavcodec/dsputil.c.orig Sun Feb 18 22:17:14 2007
++++ src/libffmpeg/libavcodec/dsputil.c Sun Feb 18 22:15:46 2007
+@@ -3810,7 +3810,7 @@
+ static int did_fail=0;
+ DECLARE_ALIGNED_16(int, aligned);
+
+- if((int)&aligned & 15){
++ if((intptr_t)&aligned & 15){
+ if(!did_fail){
+ #if defined(HAVE_MMX) || defined(HAVE_ALTIVEC)
+ av_log(NULL, AV_LOG_ERROR,
--- /dev/null
+++ multimedia/libxine/files/patch-src_libreal_xine_real_audio_decoder.c
@@ -0,0 +1,22 @@
+--- src/libreal/xine_real_audio_decoder.c.orig 2008-01-01 22:30:08.000000000 +0900
++++ src/libreal/xine_real_audio_decoder.c 2008-01-20 01:44:15.000000000 +0900
+@@ -45,6 +45,19 @@
+
+ #include "real_common.h"
+
++#if defined(__FreeBSD__)
++void ___brk_addr(void) {exit(0);}
++void __ctype_b(void) {exit(0);}
++void __strtod_internal(void) {exit(0);}
++void __strtold_internal(void) {exit(0);}
++void __strtof_internal(void) {exit(0);}
++void __errno_location(void) {exit(0);}
++void dl_iterate_phdr(void) {exit(0);}
++char **__environ={NULL};
++#undef stderr
++FILE *stderr=NULL;
++#endif
++
+ typedef struct {
+ audio_decoder_class_t decoder_class;
+
--- /dev/null
+++ multimedia/libxine/files/patch-src_libreal_real_common.c
@@ -0,0 +1,10 @@
+--- src/libreal/real_common.c.orig 2008-01-01 22:30:08.000000000 +0900
++++ src/libreal/real_common.c 2008-01-13 04:05:14.000000000 +0900
+@@ -97,6 +97,7 @@
+ { O | UL, "codecs" },
+ { O | UL | UL64, "real" },
+ { O, "real/RealPlayer/codecs" },
++ { OL | OL64 | UL | UL64, "RealPlayer/codecs" },
+ { OL | OL64 | UL | UL64, "RealPlayer10GOLD/codecs" },
+ { OL | OL64 | UL | UL64, "RealPlayer10/codecs" },
+ { OL | OL64 | UL | UL64, "RealPlayer9/users/Real/Codecs" },
Index: patch-src_audio_out_audio_oss_out.c
===================================================================
RCS file: /home/cvs/mports/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c -L multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c -u -r1.1 -r1.2
--- multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c
+++ multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c
@@ -1,6 +1,6 @@
---- src/audio_out/audio_oss_out.c.orig Mon Dec 13 07:01:02 2004
-+++ src/audio_out/audio_oss_out.c Mon Jan 30 03:02:46 2006
-@@ -155,7 +155,7 @@
+--- src/audio_out/audio_oss_out.c.orig Mon Apr 16 02:42:15 2007
++++ src/audio_out/audio_oss_out.c Sun Jul 1 14:42:59 2007
+@@ -163,7 +163,7 @@
uint32_t bits, uint32_t rate, int mode) {
oss_driver_t *this = (oss_driver_t *) this_gen;
@@ -9,7 +9,7 @@
xprintf(this->xine, XINE_VERBOSITY_DEBUG,
"audio_oss_out: ao_open rate=%d, mode=%d, dev=%s\n", rate, mode, this->audio_dev);
-@@ -287,14 +287,14 @@
+@@ -295,14 +295,14 @@
if (bits==8) {
xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: SNDCTL_DSP_SETFMT failed for AFMT_U8.\n");
if (tmp != AFMT_U8)
@@ -26,7 +26,7 @@
else
xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: The AFMT_S16_NE ioctl failed.\n");
return 0;
-@@ -313,7 +313,7 @@
+@@ -321,7 +321,7 @@
tmp = AFMT_AC3;
if (ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp) < 0 || tmp != AFMT_AC3) {
xprintf(this->xine, XINE_VERBOSITY_DEBUG,
@@ -35,67 +35,61 @@
tmp = AFMT_S16_LE;
ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp);
}
-@@ -369,7 +369,7 @@
+@@ -377,7 +377,7 @@
count_info info;
oss_driver_t *this = (oss_driver_t *) this_gen;
- int bytes_left;
-+ long bytes_left;
++ long bytes_left;
int frames;
struct timeval tv;
-@@ -507,7 +507,7 @@
+@@ -515,7 +515,7 @@
static int ao_oss_get_property (ao_driver_t *this_gen, int property) {
oss_driver_t *this = (oss_driver_t *) this_gen;
- int audio_devs;
-+ long audio_devs;
++ long audio_devs;
switch(property) {
case AO_PROP_PCM_VOL:
-@@ -515,8 +515,8 @@
- if(!this->mixer.mute) {
+@@ -524,7 +524,7 @@
if(this->mixer.fd != -1) {
-- int cmd = 0;
+ IOCTL_REQUEST_TYPE cmd = 0;
- int v;
-+ long cmd = 0;
+ long v;
ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs);
-@@ -546,7 +546,7 @@
+@@ -554,7 +554,7 @@
static int ao_oss_set_property (ao_driver_t *this_gen, int property, int value) {
oss_driver_t *this = (oss_driver_t *) this_gen;
- int audio_devs;
-+ long audio_devs;
++ long audio_devs;
switch(property) {
case AO_PROP_PCM_VOL:
-@@ -554,8 +554,8 @@
- if(!this->mixer.mute) {
+@@ -563,7 +563,7 @@
if(this->mixer.fd != -1) {
-- int cmd = 0;
+ IOCTL_REQUEST_TYPE cmd = 0;
- int v;
-+ long cmd = 0;
+ long v;
ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs);
-@@ -583,8 +583,8 @@
- if(this->mixer.mute) {
+@@ -592,7 +592,7 @@
if(this->mixer.fd != -1) {
-- int cmd = 0;
+ IOCTL_REQUEST_TYPE cmd = 0;
- int v = 0;
-+ long cmd = 0;
+ long v = 0;
ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs);
-@@ -657,7 +657,7 @@
+@@ -665,7 +665,7 @@
static int probe_audio_devices(oss_driver_t *this) {
const char *base_names[2] = {"/dev/dsp", "/dev/sound/dsp"};
int base_num, i;
@@ -104,15 +98,16 @@
int best_rate;
char devname[30];
-@@ -696,9 +696,9 @@
+@@ -704,9 +704,9 @@
oss_class_t *class = (oss_class_t *) class_gen;
config_values_t *config = class->config;
oss_driver_t *this;
- int caps;
-+ long caps;
- int audio_fd;
+- int audio_fd;
- int num_channels, status, arg;
-+ long num_channels, status, arg;
++ long caps;
++ long audio_fd;
++ long num_channels, status, arg;
static char *sync_methods[] = {"auto", "getodelay", "getoptr", "softsync", "probebuffer", NULL};
static char *devname_opts[] = {"auto", "/dev/dsp", "/dev/sound/dsp", NULL};
int devname_val, devname_num;
--- /dev/null
+++ multimedia/libxine/files/patch-misc_libxine.pc.in
@@ -0,0 +1,14 @@
+--- misc/libxine.pc.in.orig 2008-02-03 22:02:31.000000000 +0900
++++ misc/libxine.pc.in 2008-02-03 22:03:24.000000000 +0900
+@@ -19,7 +19,7 @@
+ Description: The xine engine library
+ Version: @XINE_MAJOR at .@XINE_MINOR at .@XINE_SUB@@XINE_PATCH@
+ Requires:
+-Libs: -L${libdir} -lxine
+-Libs.private: @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
+-Cflags: -I${includedir}
+-Cflags.private: @PTHREAD_CFLAGS@
++Libs: -L${libdir} -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
++Libs.private:
++Cflags: -I${includedir} @PTHREAD_CFLAGS@
++Cflags.private:
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/multimedia/libxine/files/patch-configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -L multimedia/libxine/files/patch-configure -L multimedia/libxine/files/patch-configure -u -r1.2 -r1.3
--- multimedia/libxine/files/patch-configure
+++ multimedia/libxine/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Thu Dec 7 00:50:39 2006
-+++ configure Thu Dec 7 01:20:03 2006
-@@ -8768,6 +8768,12 @@
+--- configure.orig 2008-02-08 06:38:17.000000000 +0900
++++ configure 2008-02-24 13:42:11.000000000 +0900
+@@ -9327,6 +9327,12 @@
fi
;;
@@ -13,7 +13,7 @@
linux*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
-@@ -21903,7 +21909,7 @@
+@@ -22572,7 +22578,7 @@
if test -z "$haveit"; then
LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
fi
@@ -22,8 +22,8 @@
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
else
LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-@@ -36572,6 +36578,8 @@
- fi
+@@ -37624,6 +37630,8 @@
+ fi
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
+else
@@ -31,3 +31,12 @@
fi
if test "x$no_libFLAC" = "x" ; then
+@@ -49857,7 +49865,7 @@
+
+ xinelibdir='${libdir}/xine'
+ xinedatadir='${datadir}/xine'
+-pkgconfigdir='${libdir}/pkgconfig'
++pkgconfigdir='${prefix}/libdata/pkgconfig'
+
+
+
--- multimedia/libxine/files/patch-src:libreal:audio_decoder.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/libreal/audio_decoder.c.orig Sun Jul 9 23:39:11 2006
-+++ src/libreal/audio_decoder.c Sun Jul 23 21:38:59 2006
-@@ -48,6 +48,14 @@
- #include "buffer.h"
- #include "xineutils.h"
-
-+#if defined(__FreeBSD__)
-+void ___brk_addr(void) {exit(0);}
-+void __ctype_b(void) {exit(0);}
-+char **__environ={NULL};
-+#undef stderr
-+FILE *stderr=NULL;
-+#endif
-+
- typedef struct {
- audio_decoder_class_t decoder_class;
-
-@@ -713,28 +721,14 @@
-
- /* try some auto-detection */
-
-- if (!stat ("/usr/local/RealPlayer8/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/local/RealPlayer8/Codecs";
-- if (!stat ("/usr/RealPlayer8/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/RealPlayer8/Codecs";
-- if (!stat ("/usr/lib/RealPlayer8/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/lib/RealPlayer8/Codecs";
-- if (!stat ("/opt/RealPlayer8/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/opt/RealPlayer8/Codecs";
-- if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/lib/RealPlayer9/users/Real/Codecs";
-- if (!stat ("/usr/lib/RealPlayer10/codecs/drvc.so", &s))
-- default_real_codec_path = "/usr/lib/RealPlayer10/codecs";
-- if (!stat ("/usr/lib64/RealPlayer8/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs";
-- if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs";
-- if (!stat ("/usr/lib64/RealPlayer10/codecs/drvc.so", &s))
-- default_real_codec_path = "/usr/lib64/RealPlayer10/codecs";
-- if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/lib/codecs";
-- if (!stat ("/usr/lib/win32/drv3.so.6.0", &s))
-- default_real_codec_path = "/usr/lib/win32";
-+ if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s))
-+ default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs";
-+ if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
-+ default_real_codec_path = "/usr/local/lib/RealPlayer9/users/Real/Codecs";
-+ if (!stat ("/usr/X11R6/lib/RealPlayer/codecs/drvc.so", &s))
-+ default_real_codec_path = "/usr/X11R6/lib/RealPlayer/codecs";
-+ if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s))
-+ default_real_codec_path = "/usr/local/lib/win32";
-
- real_codec_path = config->register_string (config, "decoder.external.real_codecs_path",
- default_real_codec_path,
--- multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h.orig Sat Jul 30 03:14:40 2005
-+++ src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h Sun Dec 11 02:54:16 2005
-@@ -1,8 +1,6 @@
- #include <string.h>
- #include <math.h>
--#ifdef HAVE_MALLOC_H
--#include <malloc.h>
--#endif
-+#include <stdlib.h>
-
- #define USE_FOR_DSCALER
-
--- multimedia/libxine/files/patch-src_input_input_vcd.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/input/input_vcd.c.orig Thu Sep 28 06:51:16 2006
-+++ src/input/input_vcd.c Thu Sep 28 07:03:55 2006
-@@ -25,7 +25,6 @@
- #include "config.h"
- #endif
-
--#include <netinet/in.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/stat.h>
-@@ -34,6 +33,7 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <string.h>
-+#include <netinet/in.h>
- #ifdef HAVE_LINUX_CDROM_H
- # include <linux/cdrom.h>
- #endif
More information about the Midnightbsd-cvs
mailing list