From 16fe99647c095726e11fc54e88f6e1583b6cfcbb Mon Sep 17 00:00:00 2001 From: xtraeme Date: Thu, 23 Dec 2004 03:05:53 +0000 Subject: Some fixes for this package: * Build the oss audio plugin, fix hardcoded audio device. * When Mesa is used the opengl plugin is not built, check this via USE_BUILTIN.{MesaLib,glu}. * Fix some tests in configure.ac. * Add PLIST.common_end to remove directories, otherwise the dirs are not removed correctly. More changes to come in the future for configure.ac... Bump PKGREVISION. --- multimedia/xine-lib/Makefile | 28 +++++++++++++-- multimedia/xine-lib/Makefile.common | 3 +- multimedia/xine-lib/PLIST.common | 19 +++------- multimedia/xine-lib/PLIST.common_end | 14 ++++++++ multimedia/xine-lib/distinfo | 6 ++-- multimedia/xine-lib/patches/patch-ag | 68 ++++++++++++++++++++++++++++++++---- multimedia/xine-lib/patches/patch-bd | 35 +++++++++++++++++++ multimedia/xine-lib/patches/patch-be | 21 +++++++++++ 8 files changed, 169 insertions(+), 25 deletions(-) create mode 100644 multimedia/xine-lib/PLIST.common_end create mode 100644 multimedia/xine-lib/patches/patch-bd create mode 100644 multimedia/xine-lib/patches/patch-be diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 822bd5c0173..99ccba8853a 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.14 2004/10/27 20:31:33 drochner Exp $ +# $NetBSD: Makefile,v 1.15 2004/12/23 03:05:53 xtraeme Exp $ # .include "Makefile.common" +PKGREVISION= 1 + .if ${MACHINE_ARCH} == "i386" DEPENDS+= win32-codecs>=011227:../../multimedia/win32-codecs PLIST_SUBST+= I386="" @@ -12,12 +14,34 @@ PLIST_SUBST+= I386="@comment " BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 +SUBST_CLASSES+= oss +SUBST_STAGE.oss= post-patch +SUBST_FILES.oss= src/audio_out/audio_oss_out.c +SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" +.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" +SUBST_SED.oss+= -e "s,\"dsp\",\"audio\",g" +.endif +SUBST_MESSAGE.oss= "Fixing hardcoded audio device." + +# This needs to come before checking the values, otherwise the builtin.mk +# files are not doing its work. +.include "../../graphics/Mesa/buildlink3.mk" + +USE_BUILTIN.MesaLib?= no +USE_BUILTIN.glu?= no + +.if !empty(USE_BUILTIN.MesaLib:M[Yy][Ee][Ss]) && \ + !empty(USE_BUILTIN.glu:M[Yy][Ee][Ss]) +PLIST_SUBST+= OPENGL_PLUGIN= +.else +PLIST_SUBST+= OPENGL_PLUGIN='@comment ' +.endif + .include "../../audio/flac/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/aalib/buildlink3.mk" -.include "../../graphics/Mesa/buildlink3.mk" .include "../../graphics/mng/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../misc/libcdio/buildlink3.mk" diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 75b294a47a0..e3c3b233316 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2004/12/21 18:56:44 drochner Exp $ +# $NetBSD: Makefile.common,v 1.15 2004/12/23 03:05:53 xtraeme Exp $ # DISTNAME= xine-lib-1-rc8 @@ -48,5 +48,6 @@ pre-configure: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/autoconf.mk" diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common index b9c23b5ede7..710b30a6723 100644 --- a/multimedia/xine-lib/PLIST.common +++ b/multimedia/xine-lib/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.6 2004/12/21 18:56:44 drochner Exp $ +@comment $NetBSD: PLIST.common,v 1.7 2004/12/23 03:05:53 xtraeme Exp $ bin/xine-config include/xine.h include/xine/attributes.h @@ -52,6 +52,8 @@ lib/xine/plugins/1.0.0/xineplug_ao_out_file.a lib/xine/plugins/1.0.0/xineplug_ao_out_file.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_oss.a +lib/xine/plugins/1.0.0/xineplug_ao_out_oss.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_bitplane.a @@ -182,6 +184,8 @@ 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 +${OPENGL_PLUGIN}lib/xine/plugins/1.0.0/xineplug_vo_out_opengl.a +${OPENGL_PLUGIN}lib/xine/plugins/1.0.0/xineplug_vo_out_opengl.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_xshm.a @@ -249,16 +253,3 @@ share/xine/libxine1/fonts/serif-24.xinefont.gz share/xine/libxine1/fonts/serif-32.xinefont.gz share/xine/libxine1/fonts/serif-48.xinefont.gz share/xine/libxine1/fonts/serif-64.xinefont.gz -@dirrm share/xine/libxine1/fonts -@dirrm share/xine/libxine1 -@dirrm share/xine -@dirrm share/doc/xine/hackersguide -@dirrm share/doc/xine/faq -@dirrm share/doc/xine -@exec ${MKDIR} %D/lib/xine/plugins/1.0.0/vidix -@dirrm lib/xine/plugins/1.0.0/vidix -@dirrm lib/xine/plugins/1.0.0/post -@dirrm lib/xine/plugins/1.0.0 -@dirrm lib/xine/plugins -@dirrm lib/xine -@dirrm include/xine diff --git a/multimedia/xine-lib/PLIST.common_end b/multimedia/xine-lib/PLIST.common_end new file mode 100644 index 00000000000..997972db85b --- /dev/null +++ b/multimedia/xine-lib/PLIST.common_end @@ -0,0 +1,14 @@ +@comment $NetBSD: PLIST.common_end,v 1.1 2004/12/23 03:05:53 xtraeme Exp $ +@dirrm share/xine/libxine1/fonts +@dirrm share/xine/libxine1 +@dirrm share/xine +@dirrm share/doc/xine/hackersguide +@dirrm share/doc/xine/faq +@dirrm share/doc/xine +@exec ${MKDIR} %D/lib/xine/plugins/1.0.0/vidix +@dirrm lib/xine/plugins/1.0.0/vidix +@dirrm lib/xine/plugins/1.0.0/post +@dirrm lib/xine/plugins/1.0.0 +@dirrm lib/xine/plugins +@dirrm lib/xine +@dirrm include/xine diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 66f57a1fdbb..cb984566362 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2004/12/21 18:56:44 drochner Exp $ +$NetBSD: distinfo,v 1.11 2004/12/23 03:05:53 xtraeme Exp $ SHA1 (xine-lib-1-rc8.tar.gz) = de130119fa177273e3c16186b24e347ebba8d7b6 Size (xine-lib-1-rc8.tar.gz) = 7354157 bytes @@ -7,7 +7,7 @@ SHA1 (patch-ab) = a5205d23d02dff84b0e8a9f850f3833cacc28c5a SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938 -SHA1 (patch-ag) = f9e0a5e57e24739e2526266e1804b2a0b4ff41ed +SHA1 (patch-ag) = 1a439f8025c07d183f054fea77a70ef86ff59217 SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97 SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16 @@ -21,3 +21,5 @@ SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa SHA1 (patch-ba) = a527975fe9675358090bddc1361b707aa122f89b SHA1 (patch-bb) = 40978e50dcb060a2b8314b310a68684e62e90bc2 SHA1 (patch-bc) = b0ad58ac1f06cebe5990caeeeff5a5e3e40d480b +SHA1 (patch-bd) = 5352293022da25b08598d42655af2524ff99b28a +SHA1 (patch-be) = 6555d60cc134d62f65adf52c9034b638c340a9cd diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag index 7673f939ed5..a77caed5f2c 100644 --- a/multimedia/xine-lib/patches/patch-ag +++ b/multimedia/xine-lib/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.5 2004/10/27 20:31:33 drochner Exp $ +$NetBSD: patch-ag,v 1.6 2004/12/23 03:05:53 xtraeme Exp $ ---- configure.ac.orig 2004-09-16 17:10:45.000000000 +0200 -+++ configure.ac -@@ -385,6 +385,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- +--- configure.ac.orig 2004-12-14 23:06:47.000000000 +0100 ++++ configure.ac 2004-12-23 02:02:47.000000000 +0100 +@@ -395,6 +395,9 @@ AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) AC_SUBST(NET_LIBS) @@ -12,7 +12,34 @@ $NetBSD: patch-ag,v 1.5 2004/10/27 20:31:33 drochner Exp $ dnl --------------------------------------------- dnl socklen_t -@@ -610,8 +613,7 @@ dnl Checks for Xinerama extension +@@ -571,7 +574,7 @@ + AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions) + AC_MSG_RESULT() + dnl Check if vld "extended" XvMC is available +-if test x$xxmc_stub == "xXvMCW"; then ++if test x$xxmc_stub = "xXvMCW"; then + AC_CHECK_LIB($xxmc_stub, XvMCPutSlice, + ac_have_xxmc="yes", + [ac_have_xxmc="no" +@@ -600,7 +603,7 @@ + fi + dnl Try fallback to standard XvMC if vld failed + if test x$ac_have_xxmc = "xno"; then +- if test x$xxmc_stub == "xXvMCW"; then ++ if test x$xxmc_stub = "xXvMCW"; then + AC_CHECK_LIB($xxmc_stub, XvMCCreateContext, + ac_have_xxmc="yes", + [ac_have_xxmc="no" +@@ -654,7 +657,7 @@ + XVMC_LIB="-L$xvmc_path -l$xvmc_stub" + AC_MSG_CHECKING(whether to enable the xvmc plugin) + AC_MSG_RESULT() +-if test x$xvmc_stub == "xXvMCW"; then ++if test x$xvmc_stub = "xXvMCW"; then + AC_CHECK_LIB($xvmc_stub, XvMCCreateContext, + ac_have_xvmc="yes", + [ac_have_xvmc="no" +@@ -694,8 +697,7 @@ dnl --------------------------------------------- AC_CHECK_LIB(Xinerama, XineramaQueryExtension, @@ -22,7 +49,36 @@ $NetBSD: patch-ag,v 1.5 2004/10/27 20:31:33 drochner Exp $ ac_have_xinerama="yes"],, [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) dnl AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes") -@@ -1015,9 +1017,10 @@ dnl ------------------------------------ +@@ -1068,9 +1070,19 @@ + dnl OSS style audio interface + dnl --------------------------------------------- + ++case "$host" in ++ *-*-netbsd*|*-*-openbsd*) ++ OSS_LIBS="-lossaudio" ++ ;; ++ *) ++ OSS_LIBS="" ++ ;; ++esac ++ + AC_MSG_CHECKING(for OSS audio support) + have_ossaudio=no + AC_TRY_COMPILE([ ++ #include + #ifdef __NetBSD__ + #include + #else +@@ -1083,7 +1095,7 @@ + ]) + AC_MSG_RESULT($have_ossaudio) + AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes") +- ++AC_SUBST(OSS_LIBS) + + dnl --------------------------------------------- + dnl Alsa support +@@ -1124,9 +1136,10 @@ dnl gnome-vfs support dnl --------------------------------------------- diff --git a/multimedia/xine-lib/patches/patch-bd b/multimedia/xine-lib/patches/patch-bd new file mode 100644 index 00000000000..84fbbe5a3f1 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-bd @@ -0,0 +1,35 @@ +$NetBSD: patch-bd,v 1.1 2004/12/23 03:05:53 xtraeme Exp $ + +--- src/audio_out/audio_oss_out.c.orig 2004-12-23 01:13:26.000000000 +0100 ++++ src/audio_out/audio_oss_out.c 2004-12-23 01:15:23.000000000 +0100 +@@ -419,6 +419,7 @@ + } + this->last_getoptr = info.bytes; + break; ++#ifndef __NetBSD__ + case OSS_SYNC_GETODELAY: + if (ioctl (this->audio_fd, SNDCTL_DSP_GETODELAY, &bytes_left)) { + perror ("audio_oss_out: DSP_GETODELAY ioctl():"); +@@ -429,6 +430,7 @@ + lprintf ("%d bytes left\n", bytes_left); + + break; ++#endif + } + + return bytes_left / this->bytes_per_frame; +@@ -833,10 +835,13 @@ + * check if SNDCTL_DSP_GETODELAY works. if so, using it is preferred. + */ + ++#ifndef __NetBSD__ + if (ioctl(audio_fd, SNDCTL_DSP_GETODELAY, &info) != -1) { + xprintf(class->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: using SNDCTL_DSP_GETODELAY\n"); + this->sync_method = OSS_SYNC_GETODELAY; +- } else if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &info) != -1) { ++ } ++#endif ++ if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &info) != -1) { + xprintf(class->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: using SNDCTL_DSP_GETOPTR\n"); + this->sync_method = OSS_SYNC_GETOPTR; + } else { diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be new file mode 100644 index 00000000000..513846f58f5 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-be @@ -0,0 +1,21 @@ +$NetBSD: patch-be,v 1.1 2004/12/23 03:05:53 xtraeme Exp $ + +--- src/audio_out/Makefile.in.orig 2004-12-15 14:02:27.000000000 +0100 ++++ src/audio_out/Makefile.in 2004-12-23 02:16:38.000000000 +0100 +@@ -310,6 +310,7 @@ + OGG_LIBS = @OGG_LIBS@ + OPENGL_CFLAGS = @OPENGL_CFLAGS@ + OPENGL_LIBS = @OPENGL_LIBS@ ++OSS_LIBS = @OSS_LIBS@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -508,7 +509,7 @@ + xineplug_ao_out_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ + + xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c +-xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) ++xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(OSS_LIBS) + xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ + + xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c -- cgit v1.2.3