diff options
| author | jmmv <jmmv> | 2004-01-26 13:06:14 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2004-01-26 13:06:14 +0000 |
| commit | 6d28cb961bb4b496e4d38b5293b105ba80f2b4bf (patch) | |
| tree | c951b7fb49675516219a75ead6d7563dba64211a /graphics | |
| parent | d051596aa4c77dcb5714396cfcd13eeaced591e2 (diff) | |
| download | pkgsrc-6d28cb961bb4b496e4d38b5293b105ba80f2b4bf.tar.gz | |
xine-lib and xine-ui moved to the multimedia category.
Diffstat (limited to 'graphics')
40 files changed, 1 insertions, 1797 deletions
diff --git a/graphics/Makefile b/graphics/Makefile index 2b567687c6d..0244945be66 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.278 2004/01/26 13:00:14 jmmv Exp $ +# $NetBSD: Makefile,v 1.279 2004/01/26 13:06:14 jmmv Exp $ # COMMENT= Graphics tools and libraries @@ -249,8 +249,6 @@ SUBDIR+= xfce4-artwork SUBDIR+= xfce4-iconbox SUBDIR+= xfig SUBDIR+= xgraph -SUBDIR+= xine-lib -SUBDIR+= xine-ui SUBDIR+= xli SUBDIR+= xpaint SUBDIR+= xplot diff --git a/graphics/xine-lib/DESCR b/graphics/xine-lib/DESCR deleted file mode 100644 index e01207ee909..00000000000 --- a/graphics/xine-lib/DESCR +++ /dev/null @@ -1,5 +0,0 @@ - Xine is a free multimedia player library for playing back CDs, DVDs, -and VCDs. It also decodes multimedia files like AVI, MOV, WMV, and MP3 -from local disk drives, and displays multimedia streamed over the -Internet. It interprets many of the most common multimedia formats -available -- and some of the most uncommon formats, too. diff --git a/graphics/xine-lib/Makefile b/graphics/xine-lib/Makefile deleted file mode 100644 index 8ee6031facd..00000000000 --- a/graphics/xine-lib/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: Makefile,v 1.19 2004/01/26 12:42:02 jmmv Exp $ -# - -.include "Makefile.common" - -PKGREVISION= 3 - -.if ${MACHINE_ARCH} == "i386" -DEPENDS+= win32-codecs>=011227:../../multimedia/win32-codecs -PLIST_SRC= ${PKGDIR}/PLIST.i386 -.endif -PLIST_SRC+= ${PKGDIR}/PLIST - -.include "../../audio/flac/buildlink2.mk" -.include "../../audio/libvorbis/buildlink2.mk" -.include "../../converters/libiconv/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/SDL/buildlink2.mk" -.include "../../graphics/aalib/buildlink2.mk" -.include "../../graphics/Mesa/buildlink2.mk" -.include "../../graphics/mng/buildlink2.mk" -.include "../../graphics/png/buildlink2.mk" -.include "../../multimedia/xvidcore/buildlink2.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/graphics/xine-lib/Makefile.common b/graphics/xine-lib/Makefile.common deleted file mode 100644 index 729f56df8ac..00000000000 --- a/graphics/xine-lib/Makefile.common +++ /dev/null @@ -1,40 +0,0 @@ -# $NetBSD: Makefile.common,v 1.1 2004/01/22 16:03:45 jmmv Exp $ -# - -DISTNAME= xine-lib-1-rc0a -PKGNAME= xine-lib-1rc0a -CATEGORIES?= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://xinehq.de/ -COMMENT= Multimedia player library - -DISTINFO_FILE= ${.CURDIR}/../../graphics/xine-lib/distinfo -PATCHDIR= ${.CURDIR}/../../graphics/xine-lib/patches - -BUILD_USES_MSGFMT= YES - -GNU_CONFIGURE= YES -USE_PKGLOCALEDIR= YES -USE_BUILDLINK2= YES -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool-nofpic -PKGCONFIG_OVERRIDE= ${WRKSRC}/misc/libxine.pc.in -USE_GNU_TOOLS+= make - -CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32' -CONFIGURE_ENV+= have_libpng="yes" -CONFIGURE_ENV+= PNG_CFLAGS="-I${PREFIX}/include" -CONFIGURE_ENV+= PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng" - -.if !exists(${X11BASE}/lib/libXv.so) -PLIST_SUBST+= XV_WORKAROUND="@comment " -.else -PLIST_SUBST+= XV_WORKAROUND="" -.endif - -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../graphics/freetype2/buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" diff --git a/graphics/xine-lib/PLIST b/graphics/xine-lib/PLIST deleted file mode 100644 index 40007a5f57e..00000000000 --- a/graphics/xine-lib/PLIST +++ /dev/null @@ -1,280 +0,0 @@ -@comment $NetBSD: PLIST,v 1.7 2004/01/22 16:03:45 jmmv Exp $ -bin/xine-config -include/xine.h -include/xine/attributes.h -include/xine/audio_decoder.h -include/xine/audio_out.h -include/xine/broadcaster.h -include/xine/buffer.h -include/xine/compat.h -include/xine/configfile.h -include/xine/demux.h -include/xine/input_plugin.h -include/xine/io_helper.h -include/xine/metronom.h -include/xine/osd.h -include/xine/plugin_catalog.h -include/xine/post.h -include/xine/resample.h -include/xine/scratch.h -include/xine/spu_decoder.h -include/xine/video_decoder.h -include/xine/video_out.h -include/xine/video_overlay.h -include/xine/vo_scale.h -include/xine/xine_buffer.h -include/xine/xine_check.h -include/xine/xine_internal.h -include/xine/xine_plugin.h -include/xine/xineintl.h -include/xine/xineutils.h -include/xine/xmllexer.h -include/xine/xmlparser.h -lib/libxine.a -lib/libxine.la -lib/libxine.so -lib/libxine.so.7 -lib/libxine.so.7.0 -lib/pkgconfig/libxine.pc -lib/xine/plugins/1.0.0/post/xineplug_post_goom.a -lib/xine/plugins/1.0.0/post/xineplug_post_goom.so -lib/xine/plugins/1.0.0/post/xineplug_post_mosaico.a -lib/xine/plugins/1.0.0/post/xineplug_post_mosaico.so -lib/xine/plugins/1.0.0/post/xineplug_post_planar.a -lib/xine/plugins/1.0.0/post/xineplug_post_planar.so -lib/xine/plugins/1.0.0/post/xineplug_post_switch.a -lib/xine/plugins/1.0.0/post/xineplug_post_switch.so -lib/xine/plugins/1.0.0/post/xineplug_post_tvtime.a -${XV_WORKAROUND}lib/xine/plugins/1.0.0/post/xineplug_post_tvtime.so -lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.a -lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.so -lib/xine/plugins/1.0.0/xineplug_ao_out_none.a -lib/xine/plugins/1.0.0/xineplug_ao_out_none.so -lib/xine/plugins/1.0.0/xineplug_ao_out_sun.a -lib/xine/plugins/1.0.0/xineplug_ao_out_sun.so -lib/xine/plugins/1.0.0/xineplug_decode_28k8.a -lib/xine/plugins/1.0.0/xineplug_decode_28k8.so -lib/xine/plugins/1.0.0/xineplug_decode_a52.a -lib/xine/plugins/1.0.0/xineplug_decode_a52.so -lib/xine/plugins/1.0.0/xineplug_decode_adpcm.a -lib/xine/plugins/1.0.0/xineplug_decode_adpcm.so -lib/xine/plugins/1.0.0/xineplug_decode_cinepak.a -lib/xine/plugins/1.0.0/xineplug_decode_cinepak.so -lib/xine/plugins/1.0.0/xineplug_decode_cyuv.a -lib/xine/plugins/1.0.0/xineplug_decode_cyuv.so -lib/xine/plugins/1.0.0/xineplug_decode_dts.a -lib/xine/plugins/1.0.0/xineplug_decode_dts.so -lib/xine/plugins/1.0.0/xineplug_decode_faad.a -lib/xine/plugins/1.0.0/xineplug_decode_faad.so -lib/xine/plugins/1.0.0/xineplug_decode_ff.a -lib/xine/plugins/1.0.0/xineplug_decode_ff.so -lib/xine/plugins/1.0.0/xineplug_decode_fli.a -lib/xine/plugins/1.0.0/xineplug_decode_fli.so -lib/xine/plugins/1.0.0/xineplug_decode_gsm610.a -lib/xine/plugins/1.0.0/xineplug_decode_gsm610.so -lib/xine/plugins/1.0.0/xineplug_decode_idcinvideo.a -lib/xine/plugins/1.0.0/xineplug_decode_idcinvideo.so -lib/xine/plugins/1.0.0/xineplug_decode_image.a -lib/xine/plugins/1.0.0/xineplug_decode_image.so -lib/xine/plugins/1.0.0/xineplug_decode_interplayaudio.a -lib/xine/plugins/1.0.0/xineplug_decode_interplayaudio.so -lib/xine/plugins/1.0.0/xineplug_decode_interplayvideo.a -lib/xine/plugins/1.0.0/xineplug_decode_interplayvideo.so -lib/xine/plugins/1.0.0/xineplug_decode_logpcm.a -lib/xine/plugins/1.0.0/xineplug_decode_logpcm.so -lib/xine/plugins/1.0.0/xineplug_decode_lpcm.a -lib/xine/plugins/1.0.0/xineplug_decode_lpcm.so -lib/xine/plugins/1.0.0/xineplug_decode_mad.a -lib/xine/plugins/1.0.0/xineplug_decode_mad.so -lib/xine/plugins/1.0.0/xineplug_decode_mpeg2.a -lib/xine/plugins/1.0.0/xineplug_decode_mpeg2.so -lib/xine/plugins/1.0.0/xineplug_decode_msrle.a -lib/xine/plugins/1.0.0/xineplug_decode_msrle.so -lib/xine/plugins/1.0.0/xineplug_decode_msvc.a -lib/xine/plugins/1.0.0/xineplug_decode_msvc.so -lib/xine/plugins/1.0.0/xineplug_decode_nsf.a -lib/xine/plugins/1.0.0/xineplug_decode_nsf.so -lib/xine/plugins/1.0.0/xineplug_decode_pcm.a -lib/xine/plugins/1.0.0/xineplug_decode_pcm.so -lib/xine/plugins/1.0.0/xineplug_decode_qtrle.a -lib/xine/plugins/1.0.0/xineplug_decode_qtrle.so -lib/xine/plugins/1.0.0/xineplug_decode_qtrpza.a -lib/xine/plugins/1.0.0/xineplug_decode_qtrpza.so -lib/xine/plugins/1.0.0/xineplug_decode_qtsmc.a -lib/xine/plugins/1.0.0/xineplug_decode_qtsmc.so -lib/xine/plugins/1.0.0/xineplug_decode_real.a -lib/xine/plugins/1.0.0/xineplug_decode_real.so -lib/xine/plugins/1.0.0/xineplug_decode_real_audio.a -lib/xine/plugins/1.0.0/xineplug_decode_real_audio.so -lib/xine/plugins/1.0.0/xineplug_decode_rgb.a -lib/xine/plugins/1.0.0/xineplug_decode_rgb.so -lib/xine/plugins/1.0.0/xineplug_decode_roqaudio.a -lib/xine/plugins/1.0.0/xineplug_decode_roqaudio.so -lib/xine/plugins/1.0.0/xineplug_decode_roqvideo.a -lib/xine/plugins/1.0.0/xineplug_decode_roqvideo.so -lib/xine/plugins/1.0.0/xineplug_decode_spu.a -lib/xine/plugins/1.0.0/xineplug_decode_spu.so -lib/xine/plugins/1.0.0/xineplug_decode_spucc.a -lib/xine/plugins/1.0.0/xineplug_decode_spucc.so -lib/xine/plugins/1.0.0/xineplug_decode_spuogm.a -lib/xine/plugins/1.0.0/xineplug_decode_spuogm.so -lib/xine/plugins/1.0.0/xineplug_decode_sputext.a -lib/xine/plugins/1.0.0/xineplug_decode_sputext.so -lib/xine/plugins/1.0.0/xineplug_decode_svq1.a -lib/xine/plugins/1.0.0/xineplug_decode_svq1.so -lib/xine/plugins/1.0.0/xineplug_decode_vorbis.a -lib/xine/plugins/1.0.0/xineplug_decode_vorbis.so -lib/xine/plugins/1.0.0/xineplug_decode_wc3video.a -lib/xine/plugins/1.0.0/xineplug_decode_wc3video.so -lib/xine/plugins/1.0.0/xineplug_decode_yuv.a -lib/xine/plugins/1.0.0/xineplug_decode_yuv.so -lib/xine/plugins/1.0.0/xineplug_decode_yuv_frames.a -lib/xine/plugins/1.0.0/xineplug_decode_yuv_frames.so -lib/xine/plugins/1.0.0/xineplug_dmx_asf.a -lib/xine/plugins/1.0.0/xineplug_dmx_asf.so -lib/xine/plugins/1.0.0/xineplug_dmx_audio.a -lib/xine/plugins/1.0.0/xineplug_dmx_audio.so -lib/xine/plugins/1.0.0/xineplug_dmx_avi.a -lib/xine/plugins/1.0.0/xineplug_dmx_avi.so -lib/xine/plugins/1.0.0/xineplug_dmx_fli.a -lib/xine/plugins/1.0.0/xineplug_dmx_fli.so -lib/xine/plugins/1.0.0/xineplug_dmx_games.a -lib/xine/plugins/1.0.0/xineplug_dmx_games.so -lib/xine/plugins/1.0.0/xineplug_dmx_image.a -lib/xine/plugins/1.0.0/xineplug_dmx_image.so -lib/xine/plugins/1.0.0/xineplug_dmx_mng.a -lib/xine/plugins/1.0.0/xineplug_dmx_mng.so -lib/xine/plugins/1.0.0/xineplug_dmx_mpeg.a -lib/xine/plugins/1.0.0/xineplug_dmx_mpeg.so -lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_block.a -lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_block.so -lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_elem.a -lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_elem.so -lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_pes.a -lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_pes.so -lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_ts.a -lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_ts.so -lib/xine/plugins/1.0.0/xineplug_dmx_nsv.a -lib/xine/plugins/1.0.0/xineplug_dmx_nsv.so -lib/xine/plugins/1.0.0/xineplug_dmx_ogg.a -lib/xine/plugins/1.0.0/xineplug_dmx_ogg.so -lib/xine/plugins/1.0.0/xineplug_dmx_pva.a -lib/xine/plugins/1.0.0/xineplug_dmx_pva.so -lib/xine/plugins/1.0.0/xineplug_dmx_qt.a -lib/xine/plugins/1.0.0/xineplug_dmx_qt.so -lib/xine/plugins/1.0.0/xineplug_dmx_rawdv.a -lib/xine/plugins/1.0.0/xineplug_dmx_rawdv.so -lib/xine/plugins/1.0.0/xineplug_dmx_real.a -lib/xine/plugins/1.0.0/xineplug_dmx_real.so -lib/xine/plugins/1.0.0/xineplug_dmx_slave.a -lib/xine/plugins/1.0.0/xineplug_dmx_slave.so -lib/xine/plugins/1.0.0/xineplug_dmx_sputext.a -lib/xine/plugins/1.0.0/xineplug_dmx_sputext.so -lib/xine/plugins/1.0.0/xineplug_dmx_yuv4mpeg2.a -lib/xine/plugins/1.0.0/xineplug_dmx_yuv4mpeg2.so -lib/xine/plugins/1.0.0/xineplug_dmx_yuv_frames.a -lib/xine/plugins/1.0.0/xineplug_dmx_yuv_frames.so -lib/xine/plugins/1.0.0/xineplug_flac.a -lib/xine/plugins/1.0.0/xineplug_flac.so -lib/xine/plugins/1.0.0/xineplug_inp_cdda.a -lib/xine/plugins/1.0.0/xineplug_inp_cdda.so -lib/xine/plugins/1.0.0/xineplug_inp_dvb.a -lib/xine/plugins/1.0.0/xineplug_inp_dvb.so -lib/xine/plugins/1.0.0/xineplug_inp_dvd.a -lib/xine/plugins/1.0.0/xineplug_inp_dvd.so -lib/xine/plugins/1.0.0/xineplug_inp_file.a -lib/xine/plugins/1.0.0/xineplug_inp_file.so -lib/xine/plugins/1.0.0/xineplug_inp_http.a -lib/xine/plugins/1.0.0/xineplug_inp_http.so -lib/xine/plugins/1.0.0/xineplug_inp_mms.a -lib/xine/plugins/1.0.0/xineplug_inp_mms.so -lib/xine/plugins/1.0.0/xineplug_inp_net.a -lib/xine/plugins/1.0.0/xineplug_inp_net.so -lib/xine/plugins/1.0.0/xineplug_inp_pnm.a -lib/xine/plugins/1.0.0/xineplug_inp_pnm.so -lib/xine/plugins/1.0.0/xineplug_inp_rtp.a -lib/xine/plugins/1.0.0/xineplug_inp_rtp.so -lib/xine/plugins/1.0.0/xineplug_inp_rtsp.a -lib/xine/plugins/1.0.0/xineplug_inp_rtsp.so -lib/xine/plugins/1.0.0/xineplug_inp_stdin_fifo.a -lib/xine/plugins/1.0.0/xineplug_inp_stdin_fifo.so -lib/xine/plugins/1.0.0/xineplug_inp_vcd.a -lib/xine/plugins/1.0.0/xineplug_inp_vcd.so -lib/xine/plugins/1.0.0/xineplug_vo_out_aa.a -lib/xine/plugins/1.0.0/xineplug_vo_out_aa.so -lib/xine/plugins/1.0.0/xineplug_vo_out_none.a -lib/xine/plugins/1.0.0/xineplug_vo_out_none.so -lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.a -lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.so -lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.a -lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.so -lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.a -lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so -lib/xine/plugins/1.0.0/xineplug_vo_out_xv.a -${XV_WORKAROUND}lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so -man/man1/xine-config.1 -share/aclocal/xine.m4 -share/doc/xine/README -share/doc/xine/README.config_en -share/doc/xine/README.dvb -share/doc/xine/README.dxr3 -share/doc/xine/README.dxr3_pl -share/doc/xine/README.freebsd -share/doc/xine/README.irix -share/doc/xine/README.mrl -share/doc/xine/README.network_dvd -share/doc/xine/README.opengl -share/doc/xine/README.plugins -share/doc/xine/README.solaris -share/doc/xine/README.syncfb -share/doc/xine/README.tvmode -share/doc/xine/dataflow.dia -share/doc/xine/faq/faq.html -share/doc/xine/faq/faq.txt -${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libxine1.mo -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libxine1.mo -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libxine1.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libxine1.mo -${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libxine1.mo -${PKGLOCALEDIR}/locale/pl_PL/LC_MESSAGES/libxine1.mo -${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libxine1.mo -${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libxine1.mo -share/xine/libxine1/fonts/cc-16.xinefont.gz -share/xine/libxine1/fonts/cc-20.xinefont.gz -share/xine/libxine1/fonts/cc-24.xinefont.gz -share/xine/libxine1/fonts/cc-32.xinefont.gz -share/xine/libxine1/fonts/cci-16.xinefont.gz -share/xine/libxine1/fonts/cci-20.xinefont.gz -share/xine/libxine1/fonts/cci-24.xinefont.gz -share/xine/libxine1/fonts/cci-32.xinefont.gz -share/xine/libxine1/fonts/cetus-16.xinefont.gz -share/xine/libxine1/fonts/cetus-20.xinefont.gz -share/xine/libxine1/fonts/cetus-24.xinefont.gz -share/xine/libxine1/fonts/cetus-32.xinefont.gz -share/xine/libxine1/fonts/mono-16.xinefont.gz -share/xine/libxine1/fonts/mono-20.xinefont.gz -share/xine/libxine1/fonts/mono-24.xinefont.gz -share/xine/libxine1/fonts/mono-32.xinefont.gz -share/xine/libxine1/fonts/sans-16.xinefont.gz -share/xine/libxine1/fonts/sans-20.xinefont.gz -share/xine/libxine1/fonts/sans-24.xinefont.gz -share/xine/libxine1/fonts/sans-32.xinefont.gz -share/xine/libxine1/fonts/sanshu-16.xinefont.gz -share/xine/libxine1/fonts/sanshu-20.xinefont.gz -share/xine/libxine1/fonts/sanshu-24.xinefont.gz -share/xine/libxine1/fonts/sanshu-32.xinefont.gz -share/xine/libxine1/fonts/serif-16.xinefont.gz -share/xine/libxine1/fonts/serif-20.xinefont.gz -share/xine/libxine1/fonts/serif-24.xinefont.gz -share/xine/libxine1/fonts/serif-32.xinefont.gz -@dirrm share/xine/libxine1/fonts -@dirrm share/xine/libxine1 -@dirrm share/xine -@dirrm share/doc/xine/faq -@dirrm share/doc/xine -@dirrm lib/xine/plugins/1.0.0/post -@dirrm lib/xine/plugins/1.0.0/vidix -@dirrm lib/xine/plugins/1.0.0 -@dirrm lib/xine/plugins -@dirrm lib/xine -@dirrm include/xine diff --git a/graphics/xine-lib/PLIST.i386 b/graphics/xine-lib/PLIST.i386 deleted file mode 100644 index 001953cf1a1..00000000000 --- a/graphics/xine-lib/PLIST.i386 +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST.i386,v 1.2 2003/09/05 09:58:36 drochner Exp $ -lib/xine/plugins/1.0.0/xineplug_decode_qt.a -lib/xine/plugins/1.0.0/xineplug_decode_qt.so -lib/xine/plugins/1.0.0/xineplug_decode_w32dll.a -lib/xine/plugins/1.0.0/xineplug_decode_w32dll.so diff --git a/graphics/xine-lib/buildlink2.mk b/graphics/xine-lib/buildlink2.mk deleted file mode 100644 index b38be90341d..00000000000 --- a/graphics/xine-lib/buildlink2.mk +++ /dev/null @@ -1,118 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.11 2004/01/24 09:11:54 tron Exp $ -# -# This Makefile fragment is included by packages that use xine-lib. -# - -.if !defined(XINE_LIB_BUILDLINK2_MK) -XINE_LIB_BUILDLINK2_MK= # defined - -BUILDLINK_PACKAGES+= xine-lib -BUILDLINK_DEPENDS.xine-lib?= xine-lib>=1rc0anb2 -BUILDLINK_PKGSRCDIR.xine-lib?= ../../graphics/xine-lib - -EVAL_PREFIX+= BUILDLINK_PREFIX.xine-lib=xine-lib -BUILDLINK_PREFIX.xine-lib_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.xine-lib+= include/xine.h -BUILDLINK_FILES.xine-lib+= include/xine/*.h -BUILDLINK_FILES.xine-lib+= lib/libxine.* -BUILDLINK_FILES.xine-lib+= lib/pkgconfig/libxine.pc -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/post/xineplug_post_goom.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/post/xineplug_post_invert.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/post/xineplug_post_mosaico.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/post/xineplug_post_switch.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_ao_out_esd.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_ao_out_sun.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_a52.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_adpcm.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_cinepak.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_cyuv.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_dts.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_faad.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_ff.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_fli.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_gsm610.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_idcinvideo.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_interplayaudio.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_interplayvideo.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_logpcm.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_lpcm.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_mad.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_mpeg2.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_msrle.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_msvc.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_nsf.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_qt.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_qtrle.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_qtrpza.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_qtsmc.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_real.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_real_audio.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_rgb.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_roqaudio.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_roqvideo.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_spu.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_spucc.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_sputext.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_svq1.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_vorbis.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_w32dll.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_wc3video.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_yuv.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_decode_yuv_frames.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_asf.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_audio.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_avi.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_fli.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_games.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_mng.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_mpeg.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_block.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_elem.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_ts.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_ogg.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_pva.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_qt.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_rawdv.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_real.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_sputext.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_yuv4mpeg2.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_dmx_yuv_frames.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_flac.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_cdda.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_dvb.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_dvd.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_file.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_gnome_vfs.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_http.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_mms.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_net.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_pnm.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_rtp.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_rtsp.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_stdin_fifo.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_inp_vcd.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_vo_out_aa.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_vo_out_none.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.* -BUILDLINK_FILES.xine-lib+= lib/xine/plugins/1.0.0/xineplug_vo_out_xv.* - -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../devel/SDL/buildlink2.mk" -.include "../../audio/flac/buildlink2.mk" -.include "../../audio/esound/buildlink2.mk" -.include "../../audio/libvorbis/buildlink2.mk" -.include "../../graphics/MesaLib/buildlink2.mk" -.include "../../graphics/aalib/buildlink2.mk" -.include "../../graphics/freetype2/buildlink2.mk" -.include "../../graphics/mng/buildlink2.mk" -.include "../../graphics/png/buildlink2.mk" - -BUILDLINK_TARGETS+= xine-lib-buildlink - -xine-lib-buildlink: _BUILDLINK_USE - -.endif # XINE_LIB_BUILDLINK2_MK diff --git a/graphics/xine-lib/distinfo b/graphics/xine-lib/distinfo deleted file mode 100644 index 7b182b9458b..00000000000 --- a/graphics/xine-lib/distinfo +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: distinfo,v 1.14 2003/10/24 00:49:04 mrg Exp $ - -SHA1 (xine-lib-1-rc0a.tar.gz) = ee41ba602179a9f02208a15e3dff36a1dfa00fac -Size (xine-lib-1-rc0a.tar.gz) = 4211552 bytes -SHA1 (patch-aa) = 692e3266d6250899daee1cf1c5e6733f8576a5f4 -SHA1 (patch-ab) = 4da2e4cdcb0f0f5273eae4caa196c06e3ae6064b -SHA1 (patch-ac) = df25d862f84de5221d722f9415a201986dc5d952 -SHA1 (patch-ad) = ed65116acfa1f32a0508338a11567589bc2b4123 -SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938 -SHA1 (patch-af) = 0d2860c863c4121288289b88d46433a94dde120b -SHA1 (patch-ag) = 132a8db657ce0bc3ac9e74560aae9054996fa57e -SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d -SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97 -SHA1 (patch-aj) = 54cf69b028d46327d46b5cc2a0ec457bd4a59b67 -SHA1 (patch-ak) = 5e791e17755e0b7515d81f80790d529992e827d6 -SHA1 (patch-al) = af557ce4fd64e11f84947e067f445e59628c6f99 -SHA1 (patch-am) = 0441dcd9faf0c0e7f07c8d0fc7a61fcce435af76 -SHA1 (patch-an) = 4877ff4f905c2b62c37c0d4bbb51510d8a043344 -SHA1 (patch-ao) = 53de6febfed214e9e43d53e3e5b83af1fcb19b20 -SHA1 (patch-ap) = 7bb70f8d5cee7787e831649cb746d21000a357fc -SHA1 (patch-aq) = ec5707d3b7b69912342afc7bef3e8cd182c75ded -SHA1 (patch-ar) = 3ca0dd7be3e94d3c302299efc706af27f8faf1c1 -SHA1 (patch-as) = 3f0825d62844e5dba66c97ddac515653d07e85d8 diff --git a/graphics/xine-lib/patches/disabled-patch-aa b/graphics/xine-lib/patches/disabled-patch-aa deleted file mode 100644 index f4de1f9dd12..00000000000 --- a/graphics/xine-lib/patches/disabled-patch-aa +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: disabled-patch-aa,v 1.2 2003/10/05 09:27:13 mycroft Exp $ - ---- configure.ac.orig 2003-08-02 11:45:26.000000000 +0000 -+++ configure.ac 2003-10-05 09:10:13.000000000 +0000 -@@ -301,6 +301,9 @@ - AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) - AC_SUBST(NET_LIBS) - -+WINE_LIBS="" -+AC_CHECK_LIB(i386, i386_set_ldt, WINE_LIBS="-li386 $WINE_LIBS",) -+AC_SUBST(WINE_LIBS) - - dnl --------------------------------------------- - dnl zlib -@@ -330,7 +333,7 @@ - AC_CHECK_LIB(GL, glBegin, - [AC_CHECK_HEADER(GL/gl.h, - [ ac_have_opengl="yes" -- OPENGL_LIBS="-lGL" -+ OPENGL_LIBS="-lGL -lm" - AC_CHECK_LIB(glut, glutInit, dnl check for glut - [ ac_have_glut="yes" - GLUT_LIBS="-lglut" -@@ -348,7 +351,7 @@ - ], - [])], - [], -- [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS]) -+ [$X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS]) - AC_SUBST(OPENGL_LIBS) - AC_SUBST(GLUT_LIBS) - AC_SUBST(GLU_LIBS) -@@ -456,8 +459,7 @@ - dnl --------------------------------------------- - - AC_CHECK_LIB(Xinerama, XineramaQueryExtension, -- [X_LIBS="$X_LIBS -lXinerama" -- AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) -+ [AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) - ac_have_xinerama="yes"],, - [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) - AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes") -@@ -761,9 +763,10 @@ - dnl --------------------------------------------- - dnl gnome-vfs support - dnl --------------------------------------------- --PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, -- no_gnome_vfs=no, -- no_gnome_vfs=yes) -+dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0, -+dnl no_gnome_vfs=no, -+dnl no_gnome_vfs=yes) -+no_gnome_vfs=yes - AC_SUBST(GNOME_VFS_CFLAGS) - AC_SUBST(GNOME_VFS_LIBS) - if test x"$no_gnome_vfs" != "xyes"; then diff --git a/graphics/xine-lib/patches/disabled-patch-ab b/graphics/xine-lib/patches/disabled-patch-ab deleted file mode 100644 index a4cd91af63c..00000000000 --- a/graphics/xine-lib/patches/disabled-patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: disabled-patch-ab,v 1.1 2003/10/06 04:52:06 mycroft Exp $ - ---- aclocal.m4.orig 2003-08-02 13:49:37.000000000 +0000 -+++ aclocal.m4 2003-10-06 04:36:36.000000000 +0000 -@@ -6620,7 +6620,7 @@ - XVID_LIBS="-L$xvid_prefix/lib" - fi - -- XVID_LIBS="$XVID_LIBS -lxvidcore" -+ XVID_LIBS="$XVID_LIBS -lxvidcore -lm" - - AC_MSG_CHECKING(for XviD) - no_xvid="" diff --git a/graphics/xine-lib/patches/disabled-patch-ac b/graphics/xine-lib/patches/disabled-patch-ac deleted file mode 100644 index 40ac539d8be..00000000000 --- a/graphics/xine-lib/patches/disabled-patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: disabled-patch-ac,v 1.1 2003/10/06 04:52:06 mycroft Exp $ - ---- xvid.m4.orig 2003-07-13 19:29:04.000000000 +0000 -+++ xvid.m4 2003-10-06 04:44:40.000000000 +0000 -@@ -18,7 +18,7 @@ - XVID_LIBS="-L$xvid_prefix/lib" - fi - -- XVID_LIBS="$XVID_LIBS -lxvidcore" -+ XVID_LIBS="$XVID_LIBS -lxvidcore -lm" - - AC_MSG_CHECKING(for XviD) - no_xvid="" diff --git a/graphics/xine-lib/patches/patch-aa b/graphics/xine-lib/patches/patch-aa deleted file mode 100644 index 5ede22f88c2..00000000000 --- a/graphics/xine-lib/patches/patch-aa +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2003/04/11 09:49:20 rh Exp $ - ---- src/xine-engine/video_decoder.c.orig 2003-04-06 10:23:10.000000000 +1000 -+++ src/xine-engine/video_decoder.c -@@ -33,6 +33,10 @@ - #include "xineutils.h" - #include <sched.h> - -+#ifndef SCHED_OTHER -+#define SCHED_OTHER 0 -+#endif -+ - /* - #define LOG - */ -@@ -393,7 +397,9 @@ void *video_decoder_loop (void *stream_g - void video_decoder_init (xine_stream_t *stream) { - - pthread_attr_t pth_attrs; -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - struct sched_param pth_params; -+#endif - int err, num_buffers; - - /* The fifo size is based on dvd playback where buffers are filled -@@ -416,10 +422,12 @@ void video_decoder_init (xine_stream_t * - stream->spu_track_map_entries = 0; - - pthread_attr_init(&pth_attrs); -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - pthread_attr_getschedparam(&pth_attrs, &pth_params); - pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER); - pthread_attr_setschedparam(&pth_attrs, &pth_params); - pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM); -+#endif - - if ((err = pthread_create (&stream->video_thread, - &pth_attrs, video_decoder_loop, stream)) != 0) { diff --git a/graphics/xine-lib/patches/patch-ab b/graphics/xine-lib/patches/patch-ab deleted file mode 100644 index 206609378d6..00000000000 --- a/graphics/xine-lib/patches/patch-ab +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2003/04/11 09:49:20 rh Exp $ - ---- src/xine-engine/audio_decoder.c.orig 2003-04-06 10:23:10.000000000 +1000 -+++ src/xine-engine/audio_decoder.c -@@ -353,7 +353,9 @@ void *audio_decoder_loop (void *stream_g - void audio_decoder_init (xine_stream_t *stream) { - - pthread_attr_t pth_attrs; -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - struct sched_param pth_params; -+#endif - int err; - - if (stream->audio_out == NULL) { -@@ -379,10 +381,12 @@ void audio_decoder_init (xine_stream_t * - */ - - pthread_attr_init(&pth_attrs); -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - pthread_attr_getschedparam(&pth_attrs, &pth_params); - pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER); - pthread_attr_setschedparam(&pth_attrs, &pth_params); - pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM); -+#endif - - if ((err = pthread_create (&stream->audio_thread, - &pth_attrs, audio_decoder_loop, stream)) != 0) { diff --git a/graphics/xine-lib/patches/patch-ac b/graphics/xine-lib/patches/patch-ac deleted file mode 100644 index 3d05656b14b..00000000000 --- a/graphics/xine-lib/patches/patch-ac +++ /dev/null @@ -1,118 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2003/10/02 10:11:49 mycroft Exp $ - ---- src/audio_out/audio_sun_out.c.orig 2003-07-13 19:29:04.000000000 +0000 -+++ src/audio_out/audio_sun_out.c 2003-10-02 09:51:34.000000000 +0000 -@@ -41,6 +41,11 @@ - #ifdef __svr4__ - #include <stropts.h> - #endif -+#include <sys/param.h> -+ -+#if (defined(BSD) && BSD >= 199306) -+typedef unsigned uint_t; -+#endif - - #include "xine_internal.h" - #include "xineutils.h" -@@ -89,7 +94,9 @@ - uint32_t num_channels; - int bytes_per_frame; - -+#ifndef __NetBSD__ - uint32_t frames_in_buffer; /* number of frames writen to audio hardware */ -+#endif - - enum { - RTSC_UNKNOWN = 0, -@@ -113,12 +120,14 @@ - unsigned buf_len; - #endif - -+#ifndef __NetBSD__ - #if SW_SAMPLE_COUNT - struct timeval tv0; - uint_t sample0; - #endif - - uint_t last_samplecnt; -+#endif - } sun_driver_t; - - -@@ -128,6 +137,7 @@ - */ - static int realtime_samplecounter_available(char *dev) - { -+#ifndef __NetBSD__ - int fd = -1; - audio_info_t info; - int rtsc_ok = RTSC_DISABLED; -@@ -246,6 +256,9 @@ - } - - return rtsc_ok; -+#else -+ return RTSC_ENABLED; -+#endif - } - - -@@ -431,7 +444,9 @@ - - this->mode = mode; - this->input_sample_rate = rate; -+#ifndef __NetBSD__ - this->frames_in_buffer = 0; -+#endif - - /* - * open audio device -@@ -463,6 +478,9 @@ - info.play.sample_rate = this->input_sample_rate; - info.play.eof = 0; - info.play.samples = 0; -+#ifdef __NetBSD__ -+ info.blocksize = 1024; -+#endif - - this->convert_u8_s8 = 0; - -@@ -524,7 +542,9 @@ - return 0; - } - -+#ifndef __NetBSD__ - this->last_samplecnt = 0; -+#endif - - this->output_sample_rate = info.play.sample_rate; - this->num_channels = info.play.channels; -@@ -566,6 +586,7 @@ - sun_driver_t *this = (sun_driver_t *) this_gen; - audio_info_t info; - -+#ifndef __NetBSD__ - if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0 && - (this->frames_in_buffer == 0 || info.play.samples > 0)) { - -@@ -611,6 +632,10 @@ - } - #endif - } -+#else -+ if (ioctl(this->audio_fd, AUDIO_GETINFO, &info) == 0) -+ return info.play.seek / this->bytes_per_frame; -+#endif - return NOT_REAL_TIME; - } - -@@ -719,7 +744,9 @@ - if (num_written > 0) { - int buffered_samples; - -+#ifndef __NetBSD__ - this->frames_in_buffer += num_written / this->bytes_per_frame; -+#endif - - /* - * Avoid storing too much data in the sound driver's buffers. diff --git a/graphics/xine-lib/patches/patch-ad b/graphics/xine-lib/patches/patch-ad deleted file mode 100644 index 4866e938572..00000000000 --- a/graphics/xine-lib/patches/patch-ad +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2003/09/05 09:58:37 drochner Exp $ - ---- src/input/libdvdnav/vm.c.orig 2003-07-19 19:55:20.000000000 +0200 -+++ src/input/libdvdnav/vm.c 2003-08-24 11:25:12.000000000 +0200 -@@ -35,6 +35,7 @@ - #include <assert.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <sys/param.h> - #include <fcntl.h> - - #include "ifo_types.h" -@@ -133,10 +134,11 @@ - - static void dvd_read_name(char *name, const char *device) { - int fd, i; --#if !defined(__FreeBSD__) && !defined(WIN32) -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(WIN32) - off64_t off; - #else - off_t off; -+#define lseek64 lseek - #endif - uint8_t data[DVD_VIDEO_LB_LEN]; - diff --git a/graphics/xine-lib/patches/patch-ae b/graphics/xine-lib/patches/patch-ae deleted file mode 100644 index ac510e6a602..00000000000 --- a/graphics/xine-lib/patches/patch-ae +++ /dev/null @@ -1,86 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2003/04/11 09:19:54 rh Exp $ - ---- src/input/input_vcd.c.orig 2003-04-07 02:17:07.000000000 +1000 -+++ src/input/input_vcd.c -@@ -32,6 +32,7 @@ - #include <errno.h> - #include <fcntl.h> - #include <sys/ioctl.h> -+#include <sys/param.h> - #include <string.h> - #ifdef HAVE_LINUX_CDROM_H - # include <linux/cdrom.h> -@@ -94,7 +95,7 @@ typedef struct { - #if defined (__linux__) || defined(__sun) - struct cdrom_tochdr tochdr; - struct cdrom_tocentry tocent[100]; --#elif defined (__FreeBSD__) -+#elif (defined(BSD) && BSD >= 199306) - struct ioc_toc_header tochdr; - struct cd_toc_entry *tocent; - off_t cur_sec; -@@ -119,7 +120,7 @@ typedef struct { - - int cur_track; - --#if defined (__linux__) || defined(__sun) || defined(__FreeBSD__) -+#if defined (__linux__) || defined(__sun) || (defined(BSD) && BSD >= 199306) - uint8_t cur_min, cur_sec, cur_frame; - #endif - -@@ -176,7 +177,7 @@ static int input_vcd_read_toc (vcd_input - - return 0; - } --#elif defined (__FreeBSD__) -+#elif (defined(BSD) && BSD >= 199306) - static int input_vcd_read_toc (vcd_input_class_t *this, int fd) { - - struct ioc_read_toc_entry te; -@@ -388,7 +389,7 @@ static off_t vcd_plugin_read (input_plug - memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */ - return VCDSECTORSIZE; - } --#elif defined (__FreeBSD__) -+#elif (defined(BSD) && BSD >= 199306) - static off_t vcd_plugin_read (input_plugin_t *this_gen, - char *buf, off_t nlen) { - vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; -@@ -526,7 +527,7 @@ static buf_element_t *vcd_plugin_read_bl - memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */ - return buf; - } --#elif defined (__FreeBSD__) -+#elif (defined(BSD) && BSD >= 199306) - static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, - fifo_buffer_t *fifo, off_t nlen) { - -@@ -684,7 +685,7 @@ static off_t vcd_plugin_seek (input_plug - - return offset ; /* FIXME */ - } --#elif defined (__FreeBSD__) -+#elif (defined(BSD) && BSD >= 199306) - static off_t vcd_plugin_seek (input_plugin_t *this_gen, - off_t offset, int origin) { - -@@ -758,7 +759,7 @@ static off_t vcd_plugin_get_length (inpu - - return (off_t) 0; - } --#elif defined (__FreeBSD__) -+#elif (defined(BSD) && BSD >= 199306) - static off_t vcd_plugin_get_length (input_plugin_t *this_gen) { - vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; - off_t len ; -@@ -886,6 +887,10 @@ static input_plugin_t *open_plugin (inpu - this->cur_min = this->cls->tocent[this->cur_track].cdte_addr.msf.minute; - this->cur_sec = this->cls->tocent[this->cur_track].cdte_addr.msf.second; - this->cur_frame = this->cls->tocent[this->cur_track].cdte_addr.msf.frame; -+#elif defined(__NetBSD__) -+ this->cur_min = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.minute; -+ this->cur_sec = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.second; -+ this->cur_frame = this->cls->tocent[this->cur_track+1 - this->cls->tochdr.starting_track].addr.msf.frame; - #elif defined (__FreeBSD__) - { - int bsize = 2352; diff --git a/graphics/xine-lib/patches/patch-af b/graphics/xine-lib/patches/patch-af deleted file mode 100644 index 79b9ccb4353..00000000000 --- a/graphics/xine-lib/patches/patch-af +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-af,v 1.3 2003/10/24 00:49:04 mrg Exp $ - ---- src/xine-utils/ppcasm_string.S.orig 2003-10-24 09:52:09.000000000 +1000 -+++ src/xine-utils/ppcasm_string.S 2003-10-24 09:52:39.000000000 +1000 -@@ -18,6 +18,7 @@ - - #warning Be forewarned - using PowerPC assembly - -+#ifdef __linux__ - #define __KERNEL__ - #define __ASSEMBLY__ - -@@ -26,6 +27,13 @@ - #include <asm/processor.h> - #include <asm/cache.h> - #include <asm/errno.h> -+#endif -+ -+#ifdef __NetBSD__ -+#define _STANDALONE -+ -+#include <machine/asm.h> -+#endif - - #define COPY_16_BYTES \ - lwz r7,4(r4); \ diff --git a/graphics/xine-lib/patches/patch-ag b/graphics/xine-lib/patches/patch-ag deleted file mode 100644 index 93a5881c07c..00000000000 --- a/graphics/xine-lib/patches/patch-ag +++ /dev/null @@ -1,257 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2003/10/06 04:52:06 mycroft Exp $ - ---- configure.orig 2003-08-02 13:50:43.000000000 +0000 -+++ configure 2003-10-06 04:36:21.000000000 +0000 -@@ -467,7 +467,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS XINE_MAJOR XINE_MINOR XINE_SUB XINE_IFACE_AGE XINE_BIN_AGE LT_CURRENT LT_REVISION LT_AGE TAR_NAME SPEC_VERSION LIBNAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S CCAS CCASFLAGS CCASCOMPILE ECHO RANLIB ac_ct_RANLIB LIBTOOL LIBTOOL_DEPS STATIC ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX INCLUDED_INTL_TRUE INCLUDED_INTL_FALSE DEBUG_CFLAGS ASFLAGS THREAD_LIBS THREAD_CFLAGS DYNAMIC_LD_LIBS LIBMPEG2_CFLAGS LIBA52_CFLAGS LIBFFMPEG_CFLAGS HAVE_MLIB_TRUE HAVE_MLIB_FALSE MLIB_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X11_TRUE HAVE_X11_FALSE HAVE_NVTV_TRUE HAVE_NVTV_FALSE NET_LIBS HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE ZLIB_LIBS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE GICONV_BSD_LIBS HAVE_GICONV_TRUE HAVE_GICONV_FALSE PPC_ARCH_TRUE PPC_ARCH_FALSE HAVE_XV_TRUE HAVE_XV_FALSE HAVE_XV_STATIC_TRUE HAVE_XV_STATIC_FALSE XV_LIB EXTRA_X_LIBS EXTRA_X_CFLAGS HAVE_XINERAMA_TRUE HAVE_XINERAMA_FALSE AALIB_CONFIG AAINFO AALIB_CFLAGS AALIB_LIBS HAVE_AA_TRUE HAVE_AA_FALSE HAVE_SUNFB_TRUE HAVE_SUNFB_FALSE HAVE_FB_TRUE HAVE_FB_FALSE PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVE_SDL_TRUE HAVE_SDL_FALSE LIBFAME_CONFIG LIBFAME_CFLAGS LIBFAME_LIBS HAVE_DXR3_TRUE HAVE_DXR3_FALSE HAVE_LIBFAME_TRUE HAVE_LIBFAME_FALSE HAVE_LIBRTE_TRUE HAVE_LIBRTE_FALSE HAVE_ENCODER_TRUE HAVE_ENCODER_FALSE LINUX_INCLUDE HAVE_VIDIX_TRUE HAVE_VIDIX_FALSE HAVE_LINUX_TRUE HAVE_LINUX_FALSE BUILD_DHA_KMOD_TRUE BUILD_DHA_KMOD_FALSE MKNOD DEPMOD VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE THEORA_CFLAGS THEORA_LIBS THEORAFILE_LIBS THEORAENC_LIBS HAVE_THEORA_TRUE HAVE_THEORA_FALSE SPEEX_CFLAGS SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE LIBFLAC_CFLAGS LIBFLAC_LIBS HAVE_FLAC_TRUE HAVE_FLAC_FALSE XVID_CFLAGS XVID_LIBS HAVE_XVID_TRUE HAVE_XVID_FALSE HAVE_LIBMNG_TRUE HAVE_LIBMNG_FALSE MNG_LIBS LIBPNG_CONFIG HAVE_LIBPNG_TRUE HAVE_LIBPNG_FALSE PNG_CFLAGS PNG_LIBS FREETYPE_CONFIG HAVE_FT2_TRUE HAVE_FT2_FALSE FT2_CFLAGS FT2_LIBS HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_STATIC_LIB ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_ALSA09_TRUE HAVE_ALSA09_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS HAVE_ARTS_TRUE HAVE_ARTS_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE HAVE_SUNAUDIO_TRUE HAVE_SUNAUDIO_FALSE IRIXAL_CFLAGS IRIXAL_STATIC_LIB IRIXAL_LIBS HAVE_IRIXAL_TRUE HAVE_IRIXAL_FALSE KSTAT_LIBS HAVE_CDROM_IOCTLS_TRUE HAVE_CDROM_IOCTLS_FALSE DVDNAV_CONFIG DVDNAV_CFLAGS DVDNAV_LIBS HAVE_DVDNAV_TRUE HAVE_DVDNAV_FALSE BUILD_ASF_TRUE BUILD_ASF_FALSE BUILD_FAAD_TRUE BUILD_FAAD_FALSE XINE_PLUGIN_MIN_SYMS W32_NO_OPTIMIZE ANSI_FLAGS PASS1_CFLAGS PASS2_CFLAGS HAVE_W32DLL_TRUE HAVE_W32DLL_FALSE W32DLL_DEP HAVE_FFMMX_TRUE HAVE_FFMMX_FALSE HAVE_ARMV4L_TRUE HAVE_ARMV4L_FALSE XINE_PLUGINPATH XINE_FONTPATH XINE_LOCALEPATH XINE_PLUGINDIR XINE_FONTDIR XINE_LOCALEDIR XINE_ACFLAGS XINE_DATADIR XINE_SCRIPTPATH XINE_BUILD_CC XINE_BUILD_OS XINE_BUILD_DATE w32_path INCLUDES ACLOCAL_DIR INSTALL_M4_TRUE INSTALL_M4_FALSE DEPCOMP LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS XINE_MAJOR XINE_MINOR XINE_SUB XINE_IFACE_AGE XINE_BIN_AGE LT_CURRENT LT_REVISION LT_AGE TAR_NAME SPEC_VERSION LIBNAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S CCAS CCASFLAGS CCASCOMPILE ECHO RANLIB ac_ct_RANLIB LIBTOOL LIBTOOL_DEPS STATIC ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX INCLUDED_INTL_TRUE INCLUDED_INTL_FALSE DEBUG_CFLAGS ASFLAGS THREAD_LIBS THREAD_CFLAGS DYNAMIC_LD_LIBS LIBMPEG2_CFLAGS LIBA52_CFLAGS LIBFFMPEG_CFLAGS HAVE_MLIB_TRUE HAVE_MLIB_FALSE MLIB_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X11_TRUE HAVE_X11_FALSE HAVE_NVTV_TRUE HAVE_NVTV_FALSE NET_LIBS WINE_LIBS HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE ZLIB_LIBS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE GICONV_BSD_LIBS HAVE_GICONV_TRUE HAVE_GICONV_FALSE PPC_ARCH_TRUE PPC_ARCH_FALSE HAVE_XV_TRUE HAVE_XV_FALSE HAVE_XV_STATIC_TRUE HAVE_XV_STATIC_FALSE XV_LIB EXTRA_X_LIBS EXTRA_X_CFLAGS HAVE_XINERAMA_TRUE HAVE_XINERAMA_FALSE AALIB_CONFIG AAINFO AALIB_CFLAGS AALIB_LIBS HAVE_AA_TRUE HAVE_AA_FALSE HAVE_SUNFB_TRUE HAVE_SUNFB_FALSE HAVE_FB_TRUE HAVE_FB_FALSE PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVE_SDL_TRUE HAVE_SDL_FALSE LIBFAME_CONFIG LIBFAME_CFLAGS LIBFAME_LIBS HAVE_DXR3_TRUE HAVE_DXR3_FALSE HAVE_LIBFAME_TRUE HAVE_LIBFAME_FALSE HAVE_LIBRTE_TRUE HAVE_LIBRTE_FALSE HAVE_ENCODER_TRUE HAVE_ENCODER_FALSE LINUX_INCLUDE HAVE_VIDIX_TRUE HAVE_VIDIX_FALSE HAVE_LINUX_TRUE HAVE_LINUX_FALSE BUILD_DHA_KMOD_TRUE BUILD_DHA_KMOD_FALSE MKNOD DEPMOD VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE THEORA_CFLAGS THEORA_LIBS THEORAFILE_LIBS THEORAENC_LIBS HAVE_THEORA_TRUE HAVE_THEORA_FALSE SPEEX_CFLAGS SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE LIBFLAC_CFLAGS LIBFLAC_LIBS HAVE_FLAC_TRUE HAVE_FLAC_FALSE XVID_CFLAGS XVID_LIBS HAVE_XVID_TRUE HAVE_XVID_FALSE HAVE_LIBMNG_TRUE HAVE_LIBMNG_FALSE MNG_LIBS LIBPNG_CONFIG HAVE_LIBPNG_TRUE HAVE_LIBPNG_FALSE PNG_CFLAGS PNG_LIBS FREETYPE_CONFIG HAVE_FT2_TRUE HAVE_FT2_FALSE FT2_CFLAGS FT2_LIBS HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_STATIC_LIB ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_ALSA09_TRUE HAVE_ALSA09_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS HAVE_ARTS_TRUE HAVE_ARTS_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE HAVE_SUNAUDIO_TRUE HAVE_SUNAUDIO_FALSE IRIXAL_CFLAGS IRIXAL_STATIC_LIB IRIXAL_LIBS HAVE_IRIXAL_TRUE HAVE_IRIXAL_FALSE KSTAT_LIBS HAVE_CDROM_IOCTLS_TRUE HAVE_CDROM_IOCTLS_FALSE DVDNAV_CONFIG DVDNAV_CFLAGS DVDNAV_LIBS HAVE_DVDNAV_TRUE HAVE_DVDNAV_FALSE BUILD_ASF_TRUE BUILD_ASF_FALSE BUILD_FAAD_TRUE BUILD_FAAD_FALSE XINE_PLUGIN_MIN_SYMS W32_NO_OPTIMIZE ANSI_FLAGS PASS1_CFLAGS PASS2_CFLAGS HAVE_W32DLL_TRUE HAVE_W32DLL_FALSE W32DLL_DEP HAVE_FFMMX_TRUE HAVE_FFMMX_FALSE HAVE_ARMV4L_TRUE HAVE_ARMV4L_FALSE XINE_PLUGINPATH XINE_FONTPATH XINE_LOCALEPATH XINE_PLUGINDIR XINE_FONTDIR XINE_LOCALEDIR XINE_ACFLAGS XINE_DATADIR XINE_SCRIPTPATH XINE_BUILD_CC XINE_BUILD_OS XINE_BUILD_DATE w32_path INCLUDES ACLOCAL_DIR INSTALL_M4_TRUE INSTALL_M4_FALSE DEPCOMP LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -2874,12 +2874,12 @@ - (exit $ac_status); }; }; then - for ac_declaration in \ - ''\ -+ '#include <stdlib.h>' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ -- 'void exit (int);' \ -- '#include <stdlib.h>' -+ 'void exit (int);' - do - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -3671,12 +3671,12 @@ - (exit $ac_status); }; }; then - for ac_declaration in \ - ''\ -+ '#include <stdlib.h>' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ -- 'void exit (int);' \ -- '#include <stdlib.h>' -+ 'void exit (int);' - do - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -14158,6 +14158,66 @@ - - - -+WINE_LIBS="" -+echo "$as_me:$LINENO: checking for i386_set_ldt in -li386" >&5 -+echo $ECHO_N "checking for i386_set_ldt in -li386... $ECHO_C" >&6 -+if test "${ac_cv_lib_i386_i386_set_ldt+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-li386 $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char i386_set_ldt (); -+int -+main () -+{ -+i386_set_ldt (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_i386_i386_set_ldt=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_i386_i386_set_ldt=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_i386_i386_set_ldt" >&5 -+echo "${ECHO_T}$ac_cv_lib_i386_i386_set_ldt" >&6 -+if test $ac_cv_lib_i386_i386_set_ldt = yes; then -+ WINE_LIBS="-li386 $WINE_LIBS" -+fi -+ -+ - - echo "$as_me:$LINENO: checking for gzsetparams in -lz" >&5 - echo $ECHO_N "checking for gzsetparams in -lz... $ECHO_C" >&6 -@@ -14398,7 +14458,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lGL $X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS $LIBS" -+LIBS="-lGL $X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -14578,7 +14638,7 @@ - fi - if test $ac_cv_header_GL_gl_h = yes; then - ac_have_opengl="yes" -- OPENGL_LIBS="-lGL" -+ OPENGL_LIBS="-lGL -lm" - echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5 - echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6 - if test "${ac_cv_lib_glut_glutInit+set}" = set; then -@@ -15265,7 +15325,6 @@ - echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 - echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6 - if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then -- X_LIBS="$X_LIBS -lXinerama" - - cat >>confdefs.h <<\_ACEOF - #define HAVE_XINERAMA 1 -@@ -18624,7 +18683,7 @@ - XVID_LIBS="-L$xvid_prefix/lib" - fi - -- XVID_LIBS="$XVID_LIBS -lxvidcore" -+ XVID_LIBS="$XVID_LIBS -lxvidcore -lm" - - echo "$as_me:$LINENO: checking for XviD" >&5 - echo $ECHO_N "checking for XviD... $ECHO_C" >&6 -@@ -20505,102 +20564,7 @@ - fi - - -- -- succeeded=no -- -- if test -z "$PKG_CONFIG"; then -- # Extract the first word of "pkg-config", so it can be a program name with args. --set dummy pkg-config; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- case $PKG_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -- ;; --esac --fi --PKG_CONFIG=$ac_cv_path_PKG_CONFIG -- --if test -n "$PKG_CONFIG"; then -- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 --echo "${ECHO_T}$PKG_CONFIG" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- fi -- -- if test "$PKG_CONFIG" = "no" ; then -- echo "*** The pkg-config script could not be found. Make sure it is" -- echo "*** in your path, or set the PKG_CONFIG environment variable" -- echo "*** to the full path to pkg-config." -- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -- else -- PKG_CONFIG_MIN_VERSION=0.9.0 -- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -- echo "$as_me:$LINENO: checking for gnome-vfs-2.0" >&5 --echo $ECHO_N "checking for gnome-vfs-2.0... $ECHO_C" >&6 -- -- if $PKG_CONFIG --exists "gnome-vfs-2.0" ; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- succeeded=yes -- -- echo "$as_me:$LINENO: checking GNOME_VFS_CFLAGS" >&5 --echo $ECHO_N "checking GNOME_VFS_CFLAGS... $ECHO_C" >&6 -- GNOME_VFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0"` -- echo "$as_me:$LINENO: result: $GNOME_VFS_CFLAGS" >&5 --echo "${ECHO_T}$GNOME_VFS_CFLAGS" >&6 -- -- echo "$as_me:$LINENO: checking GNOME_VFS_LIBS" >&5 --echo $ECHO_N "checking GNOME_VFS_LIBS... $ECHO_C" >&6 -- GNOME_VFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0"` -- echo "$as_me:$LINENO: result: $GNOME_VFS_LIBS" >&5 --echo "${ECHO_T}$GNOME_VFS_LIBS" >&6 -- else -- GNOME_VFS_CFLAGS="" -- GNOME_VFS_LIBS="" -- ## If we have a custom action on failure, don't print errors, but -- ## do set a variable so people can do so. -- GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0"` -- -- fi -- -- -- -- else -- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -- echo "*** See http://www.freedesktop.org/software/pkgconfig" -- fi -- fi -- -- if test $succeeded = yes; then -- no_gnome_vfs=no -- else -- no_gnome_vfs=yes -- fi -- -+no_gnome_vfs=yes - - - if test x"$no_gnome_vfs" != "xyes"; then -@@ -24379,6 +24343,7 @@ - s,@HAVE_NVTV_TRUE@,$HAVE_NVTV_TRUE,;t t - s,@HAVE_NVTV_FALSE@,$HAVE_NVTV_FALSE,;t t - s,@NET_LIBS@,$NET_LIBS,;t t -+s,@WINE_LIBS@,$WINE_LIBS,;t t - s,@HAVE_ZLIB_TRUE@,$HAVE_ZLIB_TRUE,;t t - s,@HAVE_ZLIB_FALSE@,$HAVE_ZLIB_FALSE,;t t - s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t diff --git a/graphics/xine-lib/patches/patch-ah b/graphics/xine-lib/patches/patch-ah deleted file mode 100644 index 840d3fc526a..00000000000 --- a/graphics/xine-lib/patches/patch-ah +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2003/04/11 09:19:54 rh Exp $ - ---- src/xine-engine/video_out.c.orig 2003-04-06 10:23:10.000000000 +1000 -+++ src/xine-engine/video_out.c -@@ -1443,7 +1443,9 @@ xine_video_port_t *vo_new_port (xine_t * - this->grab_only = 0; - - pthread_attr_init(&pth_attrs); -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM); -+#endif - - if ((err = pthread_create (&this->video_thread, - &pth_attrs, video_out_loop, this)) != 0) { diff --git a/graphics/xine-lib/patches/patch-ai b/graphics/xine-lib/patches/patch-ai deleted file mode 100644 index 942576b8c6b..00000000000 --- a/graphics/xine-lib/patches/patch-ai +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2003/04/11 09:19:54 rh Exp $ - ---- src/xine-engine/audio_out.c.orig 2003-04-06 10:23:10.000000000 +1000 -+++ src/xine-engine/audio_out.c -@@ -1671,7 +1671,9 @@ xine_audio_port_t *ao_new_port (xine_t * - this->audio_loop_running = 1; - - pthread_attr_init(&pth_attrs); -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM); -+#endif - - if ((err = pthread_create (&this->audio_thread, - &pth_attrs, ao_loop, this)) != 0) { diff --git a/graphics/xine-lib/patches/patch-aj b/graphics/xine-lib/patches/patch-aj deleted file mode 100644 index 2da6cf4e518..00000000000 --- a/graphics/xine-lib/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2003/09/30 12:17:01 seb Exp $ - ---- include/xine.h.in.orig 2003-07-13 19:29:04.000000000 +0000 -+++ include/xine.h.in -@@ -1677,7 +1677,7 @@ void xine_osd_get_palette (xine - - typedef enum { - XINE_TVSYSTEM_PAL = 0, -- XINE_TVSYSTEM_NTSC = 1, -+ XINE_TVSYSTEM_NTSC = 1 - } xine_tvsystem; - - /* connect to nvtvd server and save current TV and X settings */ diff --git a/graphics/xine-lib/patches/patch-ak b/graphics/xine-lib/patches/patch-ak deleted file mode 100644 index c13a3ac93a7..00000000000 --- a/graphics/xine-lib/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2003/09/30 12:17:01 seb Exp $ - ---- include/xine.h.orig 2003-08-02 13:51:35.000000000 +0000 -+++ include/xine.h -@@ -1677,7 +1677,7 @@ void xine_osd_get_palette (xine - - typedef enum { - XINE_TVSYSTEM_PAL = 0, -- XINE_TVSYSTEM_NTSC = 1, -+ XINE_TVSYSTEM_NTSC = 1 - } xine_tvsystem; - - /* connect to nvtvd server and save current TV and X settings */ diff --git a/graphics/xine-lib/patches/patch-al b/graphics/xine-lib/patches/patch-al deleted file mode 100644 index 6be99a26bd1..00000000000 --- a/graphics/xine-lib/patches/patch-al +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-al,v 1.2 2003/10/03 17:49:27 mycroft Exp $ - ---- src/libw32dll/wine/win32.c.orig 2003-10-02 12:25:52.000000000 +0000 -+++ src/libw32dll/wine/win32.c 2003-10-02 12:21:50.000000000 +0000 -@@ -440,9 +440,8 @@ - - alccnt--; - -- if (last_alloc) -- pthread_mutex_unlock(&memmut); -- else -+ pthread_mutex_unlock(&memmut); -+ if (!last_alloc) - pthread_mutex_destroy(&memmut); - - //if (alccnt < 40000) printf("MY_RELEASE: %p\t%ld (%d)\n", header, header->size, alccnt); -@@ -1350,10 +1349,12 @@ - printf("wine/win32: Win32 Warning: Accessed uninitialized Critical Section (%p)!\n", c); - } - if(cs->locked) -- if(cs->id==pthread_self()) -+ if(cs->id==pthread_self()) { -+ cs->locked++; - return; -+ } - pthread_mutex_lock(&(cs->mutex)); -- cs->locked=1; -+ cs->locked++; /* should always be 1 */ - cs->id=pthread_self(); - return; - } -@@ -1371,8 +1372,8 @@ - printf("Win32 Warning: Leaving uninitialized Critical Section %p!!\n", c); - return; - } -- cs->locked=0; -- pthread_mutex_unlock(&(cs->mutex)); -+ if (!--cs->locked) -+ pthread_mutex_unlock(&(cs->mutex)); - return; - } - static void WINAPI expDeleteCriticalSection(CRITICAL_SECTION *c) diff --git a/graphics/xine-lib/patches/patch-am b/graphics/xine-lib/patches/patch-am deleted file mode 100644 index dbc665790cd..00000000000 --- a/graphics/xine-lib/patches/patch-am +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-am,v 1.1 2003/10/02 12:31:30 mycroft Exp $ - ---- src/libw32dll/wine/ldt_keeper.c.orig 2003-07-13 19:29:04.000000000 +0000 -+++ src/libw32dll/wine/ldt_keeper.c 2003-10-02 12:28:23.000000000 +0000 -@@ -147,18 +147,9 @@ - - void Check_FS_Segment(void) - { -- int fs; -- __asm__ __volatile__( -- "movw %%fs,%%ax; mov %%eax,%0" : "=r" (fs) :: "%eax" -+ __asm__ __volatile__( -+ "movl %0,%%eax; movw %%ax, %%fs" : : "i" (TEB_SEL) : "%eax" - ); -- fs = fs & 0xffff; -- -- if( fs != TEB_SEL ) { -- printf("ldt_keeper: FS segment is not set or has being lost!\n"); -- printf(" Please report this error to xine-devel@sourceforge.net\n"); -- printf(" Aborting....\n"); -- abort(); -- } - } - - #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) diff --git a/graphics/xine-lib/patches/patch-an b/graphics/xine-lib/patches/patch-an deleted file mode 100644 index 76bb81f908a..00000000000 --- a/graphics/xine-lib/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.1 2003/10/02 14:20:35 mycroft Exp $ - ---- src/libw32dll/wine/Makefile.am.orig 2003-07-20 22:08:20.000000000 +0000 -+++ src/libw32dll/wine/Makefile.am 2003-10-02 12:53:55.000000000 +0000 -@@ -34,7 +34,7 @@ - vfl.c \ - win32.c - --libwine_la_LIBADD = stubs.lo wrapper.lo -+libwine_la_LIBADD = stubs.lo wrapper.lo ${WINE_LIBS} - - noinst_HEADERS = \ - avifmt.h \ diff --git a/graphics/xine-lib/patches/patch-ao b/graphics/xine-lib/patches/patch-ao deleted file mode 100644 index cbefeebcf71..00000000000 --- a/graphics/xine-lib/patches/patch-ao +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2003/10/02 14:20:35 mycroft Exp $ - ---- src/libw32dll/wine/Makefile.in.orig 2003-08-02 13:50:27.000000000 +0000 -+++ src/libw32dll/wine/Makefile.in 2003-10-02 12:54:19.000000000 +0000 -@@ -194,6 +194,7 @@ - VORBIS_LIBS = @VORBIS_LIBS@ - W32DLL_DEP = @W32DLL_DEP@ - W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@ -+WINE_LIBS = @WINE_LIBS@ - XINE_ACFLAGS = @XINE_ACFLAGS@ - XINE_BIN_AGE = @XINE_BIN_AGE@ - XINE_BUILD_CC = @XINE_BUILD_CC@ -@@ -258,7 +259,7 @@ - win32.c - - --libwine_la_LIBADD = stubs.lo wrapper.lo -+libwine_la_LIBADD = stubs.lo wrapper.lo ${WINE_LIBS} - - noinst_HEADERS = \ - avifmt.h \ diff --git a/graphics/xine-lib/patches/patch-ap b/graphics/xine-lib/patches/patch-ap deleted file mode 100644 index 6b742d520cf..00000000000 --- a/graphics/xine-lib/patches/patch-ap +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2003/10/05 09:27:13 mycroft Exp $ - ---- src/dxr3/Makefile.am.orig 2003-07-13 19:29:04.000000000 +0000 -+++ src/dxr3/Makefile.am 2003-10-05 09:04:21.000000000 +0000 -@@ -18,6 +18,9 @@ - if HAVE_LIBRTE - link_rte = -lrte - endif -+if HAVE_XINERAMA -+link_xinerama = -lXinerama -+endif - - lib_LTLIBRARIES = $(dxr3_modules) - -@@ -42,7 +45,7 @@ - dxr3_spu_encoder.c \ - video_out_dxr3.c - --xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) -+xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB) - xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module - - noinst_HEADERS = \ diff --git a/graphics/xine-lib/patches/patch-aq b/graphics/xine-lib/patches/patch-aq deleted file mode 100644 index fc4b99fa07c..00000000000 --- a/graphics/xine-lib/patches/patch-aq +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2003/10/05 09:27:13 mycroft Exp $ - ---- src/dxr3/Makefile.in.orig 2003-08-02 13:50:11.000000000 +0000 -+++ src/dxr3/Makefile.in 2003-10-05 09:05:25.000000000 +0000 -@@ -235,6 +235,7 @@ - @HAVE_X11_TRUE@link_x_libs = $(X_LIBS) -lXext - @HAVE_LIBFAME_TRUE@link_fame = $(LIBFAME_LIBS) - @HAVE_LIBRTE_TRUE@link_rte = -lrte -+@HAVE_XINERAMA_TRUE@link_xinerama = -lXinerama - - lib_LTLIBRARIES = $(dxr3_modules) - -@@ -257,7 +258,7 @@ - video_out_dxr3.c - - --xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) -+xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB) - xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module - - noinst_HEADERS = \ diff --git a/graphics/xine-lib/patches/patch-ar b/graphics/xine-lib/patches/patch-ar deleted file mode 100644 index 0b5972b9c3b..00000000000 --- a/graphics/xine-lib/patches/patch-ar +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2003/10/06 07:21:57 mycroft Exp $ - ---- src/video_out/video_out_aa.c.orig 2003-07-13 19:29:04.000000000 +0000 -+++ src/video_out/video_out_aa.c 2003-10-06 07:16:39.000000000 +0000 -@@ -109,6 +109,8 @@ - frame = (aa_frame_t *) malloc (sizeof (aa_frame_t)); - memset (frame, 0, sizeof (aa_frame_t)); - -+ pthread_mutex_init (&frame->vo_frame.mutex, NULL); -+ - frame->vo_frame.copy = NULL; - frame->vo_frame.field = aa_frame_field; - frame->vo_frame.dispose = aa_dispose_frame; diff --git a/graphics/xine-lib/patches/patch-as b/graphics/xine-lib/patches/patch-as deleted file mode 100644 index 2073ff42de8..00000000000 --- a/graphics/xine-lib/patches/patch-as +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-as,v 1.1 2003/10/06 07:21:57 mycroft Exp $ - ---- src/video_out/video_out_none.c.orig 2003-07-13 19:29:04.000000000 +0000 -+++ src/video_out/video_out_none.c 2003-10-06 07:16:41.000000000 +0000 -@@ -95,6 +95,8 @@ - abort(); - } - -+ pthread_mutex_init (&frame->vo_frame.mutex, NULL); -+ - frame->vo_frame.base[0] = NULL; - frame->vo_frame.base[1] = NULL; - frame->vo_frame.base[2] = NULL; diff --git a/graphics/xine-ui/DESCR b/graphics/xine-ui/DESCR deleted file mode 100644 index 0fa85875191..00000000000 --- a/graphics/xine-ui/DESCR +++ /dev/null @@ -1,6 +0,0 @@ - This is the official, xlib-based xine frontend. Xine is a free -multimedia player. It plays back CDs, DVDs, and VCDs. It also decodes -multimedia files like AVI, MOV, WMV, and MP3 from local disk drives, and -displays multimedia streamed over the Internet. It interprets many of the -most common multimedia formats available -- and some of the most uncommon -formats, too. diff --git a/graphics/xine-ui/Makefile b/graphics/xine-ui/Makefile deleted file mode 100644 index 12c36891266..00000000000 --- a/graphics/xine-ui/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# $NetBSD: Makefile,v 1.11 2003/12/08 14:41:40 wiz Exp $ -# - -DISTNAME= xine-ui-0.9.22 -PKGREVISION= 1 -CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://xinehq.de/ -COMMENT= Skinned xlib-based xine GUI - -BUILD_USES_MSGFMT= YES -BUILDLINK_DEPENDS.curl= curl>7.10.2 - -USE_PKGLOCALEDIR= YES -USE_BUILDLINK2= YES -USE_X11= YES -USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -GNU_CONFIGURE= YES - -.include "../../converters/libiconv/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../graphics/png/buildlink2.mk" -.include "../../graphics/xine-lib/buildlink2.mk" -.include "../../www/curl/buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" -.include "../../devel/ncurses/buildlink2.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/graphics/xine-ui/PLIST b/graphics/xine-ui/PLIST deleted file mode 100644 index 63b1c9bd462..00000000000 --- a/graphics/xine-ui/PLIST +++ /dev/null @@ -1,243 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2003/09/05 10:00:50 drochner Exp $ -bin/aaxine -bin/xine -bin/xine-bugreport -bin/xine-check -bin/xine-remote -man/man1/aaxine.1 -man/man1/xine-bugreport.1 -man/man1/xine-check.1 -man/man1/xine-remote.1 -man/man1/xine.1 -share/doc/xine-ui/README.config_en -share/doc/xine-ui/README.corba -share/doc/xine-ui/README_cs -share/doc/xine-ui/README_de -share/doc/xine-ui/README_en -share/doc/xine-ui/README_es -share/doc/xine-ui/README_fi -share/doc/xine-ui/README_fr -share/doc/xine-ui/README_it -share/doc/xine-ui/README_pl -share/doc/xine-ui/README_uk -share/doc/xitk/README -${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xine-ui.mo -${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xitk.mo -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xine-ui.mo -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xitk.mo -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xine-ui.mo -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xitk.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xine-ui.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xitk.mo -${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xine-ui.mo -${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xitk.mo -${PKGLOCALEDIR}/locale/pl_PL/LC_MESSAGES/xine-ui.mo -${PKGLOCALEDIR}/locale/pl_PL/LC_MESSAGES/xitk.mo -${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xine-ui.mo -${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xitk.mo -${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xine-ui.mo -${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xitk.mo -${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xine-ui.mo -${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xitk.mo -share/pixmaps/xine.xpm -share/pixmaps/xine_16x16.png -share/pixmaps/xine_22x22.png -share/pixmaps/xine_32x32.png -share/pixmaps/xine_48x48.png -share/xine/desktop/xine.desktop -share/xine/skins/CelomaChrome/BigArrowDown.png -share/xine/skins/CelomaChrome/BigArrowLeft.png -share/xine/skins/CelomaChrome/BigArrowRight.png -share/xine/skins/CelomaChrome/BigArrowUp.png -share/xine/skins/CelomaChrome/CtlBg.png -share/xine/skins/CelomaChrome/CtlBtn.png -share/xine/skins/CelomaChrome/CtlDismiss.png -share/xine/skins/CelomaChrome/CtlItemBtn.png -share/xine/skins/CelomaChrome/FlitArrowDown.png -share/xine/skins/CelomaChrome/FsBtn.png -share/xine/skins/CelomaChrome/HideBtn.png -share/xine/skins/CelomaChrome/LettersBlue.png -share/xine/skins/CelomaChrome/LettersDigit.png -share/xine/skins/CelomaChrome/LettersMiddle.png -share/xine/skins/CelomaChrome/LettersMini.png -share/xine/skins/CelomaChrome/MainAutoButton.png -share/xine/skins/CelomaChrome/MainBg.png -share/xine/skins/CelomaChrome/MainButton.png -share/xine/skins/CelomaChrome/MainDummy.png -share/xine/skins/CelomaChrome/MainEject.png -share/xine/skins/CelomaChrome/MainFastB.png -share/xine/skins/CelomaChrome/MainFastF.png -share/xine/skins/CelomaChrome/MainMute.png -share/xine/skins/CelomaChrome/MainNav.png -share/xine/skins/CelomaChrome/MainNext.png -share/xine/skins/CelomaChrome/MainPause.png -share/xine/skins/CelomaChrome/MainPlay.png -share/xine/skins/CelomaChrome/MainPower.png -share/xine/skins/CelomaChrome/MainPrev.png -share/xine/skins/CelomaChrome/MainStop.png -share/xine/skins/CelomaChrome/MainVolumeBg.png -share/xine/skins/CelomaChrome/MainVolumePad.png -share/xine/skins/CelomaChrome/MrlBg.png -share/xine/skins/CelomaChrome/MrlBtn.png -share/xine/skins/CelomaChrome/MrlDismiss.png -share/xine/skins/CelomaChrome/MrlSelect.png -share/xine/skins/CelomaChrome/Onglet.png -share/xine/skins/CelomaChrome/OngletSmall.png -share/xine/skins/CelomaChrome/PlBg.png -share/xine/skins/CelomaChrome/PlBtn.png -share/xine/skins/CelomaChrome/PlDelete.png -share/xine/skins/CelomaChrome/PlDeleteAll.png -share/xine/skins/CelomaChrome/PlDismiss.png -share/xine/skins/CelomaChrome/PlInputTxt.png -share/xine/skins/CelomaChrome/PlItemBtn.png -share/xine/skins/CelomaChrome/PlMoveDn.png -share/xine/skins/CelomaChrome/PlMoveUp.png -share/xine/skins/CelomaChrome/PlPlay.png -share/xine/skins/CelomaChrome/PlSlidHBg.png -share/xine/skins/CelomaChrome/PlSlidHPad.png -share/xine/skins/CelomaChrome/SetupBtn.png -share/xine/skins/CelomaChrome/SkItemBtn.png -share/xine/skins/CelomaChrome/SkSlidBG.png -share/xine/skins/CelomaChrome/SkSlidHBg.png -share/xine/skins/CelomaChrome/SkSlidPad.png -share/xine/skins/CelomaChrome/SliderHBg.png -share/xine/skins/CelomaChrome/SliderHPad.png -share/xine/skins/CelomaChrome/SliderVBg.png -share/xine/skins/CelomaChrome/SliderVPad.png -share/xine/skins/CelomaChrome/SnapBtn.png -share/xine/skins/CelomaChrome/skinconfig -share/xine/skins/black.mpv -share/xine/skins/cloudy/ComBox.png -share/xine/skins/cloudy/ComDismiss.png -share/xine/skins/cloudy/ComLetters.png -share/xine/skins/cloudy/ComScrollArrowDown.png -share/xine/skins/cloudy/ComScrollArrowLeft.png -share/xine/skins/cloudy/ComScrollArrowRight.png -share/xine/skins/cloudy/ComScrollArrowUp.png -share/xine/skins/cloudy/ComScrollBg.png -share/xine/skins/cloudy/ComScrollHBg.png -share/xine/skins/cloudy/ComScrollHPad.png -share/xine/skins/cloudy/ComScrollPad.png -share/xine/skins/cloudy/CtlBg.png -share/xine/skins/cloudy/CtlSkinItem.png -share/xine/skins/cloudy/CtlSkinScrollBg.png -share/xine/skins/cloudy/CtlSkinScrollHBg.png -share/xine/skins/cloudy/CtlSliderBg.png -share/xine/skins/cloudy/CtlSliderPad.png -share/xine/skins/cloudy/MainAutoButton.png -share/xine/skins/cloudy/MainBg.png -share/xine/skins/cloudy/MainClose.png -share/xine/skins/cloudy/MainCtlBtn.png -share/xine/skins/cloudy/MainEject.png -share/xine/skins/cloudy/MainFullScreen.png -share/xine/skins/cloudy/MainMrlBtn.png -share/xine/skins/cloudy/MainMute.png -share/xine/skins/cloudy/MainNav.png -share/xine/skins/cloudy/MainNext.png -share/xine/skins/cloudy/MainPause.png -share/xine/skins/cloudy/MainPlBtn.png -share/xine/skins/cloudy/MainPlay.png -share/xine/skins/cloudy/MainPlayFast.png -share/xine/skins/cloudy/MainPlaySlow.png -share/xine/skins/cloudy/MainPower.png -share/xine/skins/cloudy/MainPrev.png -share/xine/skins/cloudy/MainSetup.png -share/xine/skins/cloudy/MainSliderBg.png -share/xine/skins/cloudy/MainSliderPad.png -share/xine/skins/cloudy/MainSmallArrowDown.png -share/xine/skins/cloudy/MainSmallArrowUp.png -share/xine/skins/cloudy/MainSnapshot.png -share/xine/skins/cloudy/MainStop.png -share/xine/skins/cloudy/MainVolumeBg.png -share/xine/skins/cloudy/MainVolumePad.png -share/xine/skins/cloudy/MrlBg.png -share/xine/skins/cloudy/MrlItem.png -share/xine/skins/cloudy/MrlPlay.png -share/xine/skins/cloudy/MrlSelect.png -share/xine/skins/cloudy/MrlSlidHBg.png -share/xine/skins/cloudy/PlAdd.png -share/xine/skins/cloudy/PlBg.png -share/xine/skins/cloudy/PlDelete.png -share/xine/skins/cloudy/PlDeleteAll.png -share/xine/skins/cloudy/PlInputText.png -share/xine/skins/cloudy/PlItem.png -share/xine/skins/cloudy/PlMoveDown.png -share/xine/skins/cloudy/PlMoveUp.png -share/xine/skins/cloudy/PlPlay.png -share/xine/skins/cloudy/fatsolid.pcf.gz -share/xine/skins/cloudy/fonts.dir -share/xine/skins/cloudy/skinconfig -share/xine/skins/cloudy/smooth.pcf.gz -share/xine/skins/xine-ui_logo.mpv -share/xine/skins/xine_splash.png -share/xine/skins/xinetic/BigArrowDown.png -share/xine/skins/xinetic/BigArrowLeft.png -share/xine/skins/xinetic/BigArrowRight.png -share/xine/skins/xinetic/BigArrowUp.png -share/xine/skins/xinetic/CtlBg.png -share/xine/skins/xinetic/CtlBtn.png -share/xine/skins/xinetic/CtlDismiss.png -share/xine/skins/xinetic/CtlDummy.png -share/xine/skins/xinetic/CtlReset.png -share/xine/skins/xinetic/CtlSave.png -share/xine/skins/xinetic/Letters.png -share/xine/skins/xinetic/Letters2.png -share/xine/skins/xinetic/MainAutoButton.png -share/xine/skins/xinetic/MainBg.png -share/xine/skins/xinetic/MainCam.png -share/xine/skins/xinetic/MainClose.png -share/xine/skins/xinetic/MainDown.png -share/xine/skins/xinetic/MainEject.png -share/xine/skins/xinetic/MainFastB.png -share/xine/skins/xinetic/MainFastF.png -share/xine/skins/xinetic/MainFullScreen.png -share/xine/skins/xinetic/MainMute.png -share/xine/skins/xinetic/MainNav.png -share/xine/skins/xinetic/MainNext.png -share/xine/skins/xinetic/MainPause.png -share/xine/skins/xinetic/MainPlay.png -share/xine/skins/xinetic/MainPower.png -share/xine/skins/xinetic/MainPrev.png -share/xine/skins/xinetic/MainSetup.png -share/xine/skins/xinetic/MainStop.png -share/xine/skins/xinetic/MainUp.png -share/xine/skins/xinetic/MainVolumeBg.png -share/xine/skins/xinetic/MainVolumePad.png -share/xine/skins/xinetic/MrlBg.png -share/xine/skins/xinetic/MrlBtn.png -share/xine/skins/xinetic/MrlDismiss.png -share/xine/skins/xinetic/MrlFlit.png -share/xine/skins/xinetic/MrlSelect.png -share/xine/skins/xinetic/Onglet.png -share/xine/skins/xinetic/PlBg.png -share/xine/skins/xinetic/PlBtn.png -share/xine/skins/xinetic/PlDelete.png -share/xine/skins/xinetic/PlDeleteAll.png -share/xine/skins/xinetic/PlDismiss.png -share/xine/skins/xinetic/PlInputTxt.png -share/xine/skins/xinetic/PlItemBtn.png -share/xine/skins/xinetic/PlMoveDn.png -share/xine/skins/xinetic/PlMoveUp.png -share/xine/skins/xinetic/PlPlay.png -share/xine/skins/xinetic/PlSlidHBg.png -share/xine/skins/xinetic/SkItemBtn.png -share/xine/skins/xinetic/SkSlidBG.png -share/xine/skins/xinetic/SkSlidHBg.png -share/xine/skins/xinetic/SkSlidHPad.png -share/xine/skins/xinetic/SlidHPad.png -share/xine/skins/xinetic/SliderHBg.png -share/xine/skins/xinetic/SliderHPad.png -share/xine/skins/xinetic/SliderVBg.png -share/xine/skins/xinetic/SliderVPad.png -share/xine/skins/xinetic/SmallArrowDown.png -share/xine/skins/xinetic/SmallArrowUp.png -share/xine/skins/xinetic/skinconfig -share/xine/visuals/default.avi -@dirrm share/xine/visuals -@dirrm share/xine/skins/xinetic -@dirrm share/xine/skins/cloudy -@dirrm share/xine/skins/CelomaChrome -@dirrm share/xine/skins -@dirrm share/xine/desktop -@dirrm share/doc/xitk -@dirrm share/doc/xine-ui diff --git a/graphics/xine-ui/distinfo b/graphics/xine-ui/distinfo deleted file mode 100644 index cbb618862c2..00000000000 --- a/graphics/xine-ui/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: distinfo,v 1.3 2004/01/26 11:06:19 recht Exp $ - -SHA1 (xine-ui-0.9.22.tar.gz) = bf9b7ad50f82ddb453a6c59bb68c81b6acb49f47 -Size (xine-ui-0.9.22.tar.gz) = 2637736 bytes -SHA1 (patch-aa) = 15e4f1135ee4de954a0daafe63e4837840a708f7 -SHA1 (patch-ab) = 7f3a44781d0a0418f277c082486e606058fa5357 -SHA1 (patch-ac) = 44925827dd883dabb5864ad739ed47a99fd10bda -SHA1 (patch-ad) = d285a0142c2c91ebec169839bc266c8cbe7a47e4 -SHA1 (patch-ae) = 813c897b89edbc1e37b731008b87fe6b04cf53f2 -SHA1 (patch-ag) = 4dd810e87922da673dc463367dc231105cfdeb6a diff --git a/graphics/xine-ui/patches/patch-aa b/graphics/xine-ui/patches/patch-aa deleted file mode 100644 index 2d46ac626a6..00000000000 --- a/graphics/xine-ui/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2003/09/05 10:00:50 drochner Exp $ - ---- doc/man/Makefile.in.orig 2003-08-07 19:39:57.000000000 +0200 -+++ doc/man/Makefile.in 2003-08-24 12:57:44.000000000 +0200 -@@ -159,7 +159,7 @@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ --SUBDIRS = fr es en pl de -+SUBDIRS = en - subdir = doc/man - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h diff --git a/graphics/xine-ui/patches/patch-ab b/graphics/xine-ui/patches/patch-ab deleted file mode 100644 index 15ce6bcb5ca..00000000000 --- a/graphics/xine-ui/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/04/11 11:59:56 rh Exp $ - ---- src/xitk/xine-toolkit/label.c.orig Tue Mar 4 00:43:46 2003 -+++ src/xitk/xine-toolkit/label.c -@@ -294,7 +294,7 @@ static void label_setup_label(xitk_widge - - if(label_len > private_data->length) { - pthread_attr_t pth_attrs; --#if ! defined (__OpenBSD__) -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - struct sched_param pth_params; - #endif - -@@ -303,7 +303,7 @@ static void label_setup_label(xitk_widge - pthread_attr_init(&pth_attrs); - - /* this won't work on linux, freebsd 5.0 */ --#if ! defined (__OpenBSD__) -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - pthread_attr_getschedparam(&pth_attrs, &pth_params); - pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER); - pthread_attr_setschedparam(&pth_attrs, &pth_params); diff --git a/graphics/xine-ui/patches/patch-ac b/graphics/xine-ui/patches/patch-ac deleted file mode 100644 index e77dd6b2d75..00000000000 --- a/graphics/xine-ui/patches/patch-ac +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/04/11 11:59:56 rh Exp $ - ---- src/xitk/xine-toolkit/tips.c.orig Tue Mar 4 00:43:48 2003 -+++ src/xitk/xine-toolkit/tips.c -@@ -240,12 +240,12 @@ static void *_tips_thread(void *data) { - /* Create a thread which will destroy the tips window */ - { - pthread_attr_t pth_attrs; --#if ! defined (__OpenBSD__) -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - struct sched_param pth_params; - #endif - - pthread_attr_init(&pth_attrs); --#if ! defined (__OpenBSD__) -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - pthread_attr_getschedparam(&pth_attrs, &pth_params); - pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER); - pthread_attr_setschedparam(&pth_attrs, &pth_params); -@@ -266,7 +266,7 @@ static void *_tips_thread(void *data) { - */ - void xitk_tips_create(xitk_widget_t *w) { - pthread_attr_t pth_attrs; --#if ! defined (__OpenBSD__) -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - struct sched_param pth_params; - #endif - tips_private_t *tp; -@@ -283,7 +283,7 @@ void xitk_tips_create(xitk_widget_t *w) - tp->w = w; - pthread_attr_init(&pth_attrs); - --#if ! defined (__OpenBSD__) -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - pthread_attr_getschedparam(&pth_attrs, &pth_params); - pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER); - pthread_attr_setschedparam(&pth_attrs, &pth_params); diff --git a/graphics/xine-ui/patches/patch-ad b/graphics/xine-ui/patches/patch-ad deleted file mode 100644 index eee458a50dc..00000000000 --- a/graphics/xine-ui/patches/patch-ad +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2003/04/11 11:59:56 rh Exp $ - ---- src/xitk/panel.c.orig Thu Mar 13 06:28:54 2003 -+++ src/xitk/panel.c -@@ -1320,14 +1320,14 @@ void panel_init (void) { - - { - pthread_attr_t pth_attrs; --#if ! defined (__OpenBSD__) -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - struct sched_param pth_params; - #endif - - pthread_attr_init(&pth_attrs); - - /* this won't work on linux, freebsd 5.0 */ --#if ! defined (__OpenBSD__) -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - pthread_attr_getschedparam(&pth_attrs, &pth_params); - pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER); - pthread_attr_setschedparam(&pth_attrs, &pth_params); diff --git a/graphics/xine-ui/patches/patch-ae b/graphics/xine-ui/patches/patch-ae deleted file mode 100644 index a3115e59602..00000000000 --- a/graphics/xine-ui/patches/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2003/04/11 11:59:56 rh Exp $ - ---- src/xitk/event.c.orig Thu Mar 20 01:36:08 2003 -+++ src/xitk/event.c -@@ -985,7 +985,9 @@ void gui_init (int nfiles, char *filenam - if (!XInitThreads ()) { - printf (_("\nXInitThreads failed - looks like you don't have a " - "thread-safe xlib.\n")); -+#ifndef _PTH_PTHREAD_H_ - exit (1); -+#endif - } - - if((gGui->display = XOpenDisplay((getenv("DISPLAY")))) == NULL) { diff --git a/graphics/xine-ui/patches/patch-ag b/graphics/xine-ui/patches/patch-ag deleted file mode 100644 index a78d0afd489..00000000000 --- a/graphics/xine-ui/patches/patch-ag +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2004/01/26 00:54:19 recht Exp $ - ---- src/xitk/common.h.orig 2004-01-26 01:39:55.000000000 +0100 -+++ src/xitk/common.h 2004-01-26 01:43:43.000000000 +0100 -@@ -76,6 +76,14 @@ - #include <lirc/lirc_client.h> - #endif - -+#if !defined(TRUE) -+#define TRUE 1 -+#endif -+ -+#if !defined(FALSE) -+#define FALSE 0 -+#endif -+ - /* - * config related constants - */ |