[pkgsrc/trunk]: pkgsrc/multimedia/xine-lib update to 1.1.4

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e81003cb9a98
branches:  trunk
changeset: 525145:e81003cb9a98
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Feb 07 20:04:00 2007 +0000

description:
update to 1.1.4
changes:
This release contains improvements and important bugfixes.
Some issues that have really "bugged" us for quite some
time (like NTSC DVDs audio sync, broken since 1.1.2, and
H.264 crashes) are finally fixed.
Some of the new features include True Audio and WavPack
support.
bugfixes, cleanup etc

pkgsrc notes:
-new True Audio / WavPack support is not enabled yet
-cleanup of bl3.mk: no need to propagate internals
-removed dependency on libflac -- there is support to play flac files
 internally
-removed build of plugins for more exotic video outputs (SDL, ImageMagick,
 GL, aalib), this might be built in extra pkgs (like esound and arts
 already do)

diffstat:

 multimedia/xine-lib/Makefile         |  15 ++++----
 multimedia/xine-lib/Makefile.common  |   4 +-
 multimedia/xine-lib/PLIST.common     |  62 +++++++++++++++++------------------
 multimedia/xine-lib/PLIST.common_end |   7 +--
 multimedia/xine-lib/buildlink3.mk    |  13 +------
 multimedia/xine-lib/distinfo         |  20 +++++------
 multimedia/xine-lib/patches/patch-ag |  55 +++++++++++++++----------------
 multimedia/xine-lib/patches/patch-ao |  14 ++++----
 multimedia/xine-lib/patches/patch-ap |   8 ++--
 multimedia/xine-lib/patches/patch-da |  14 ++++----
 multimedia/xine-lib/patches/patch-ea |  30 -----------------
 multimedia/xine-lib/patches/patch-ec |  17 ---------
 multimedia/xine-lib/patches/patch-ed |  15 --------
 multimedia/xine-lib/patches/patch-ee |  22 ++++++++++++
 14 files changed, 120 insertions(+), 176 deletions(-)

diffs (truncated from 576 to 300 lines):

diff -r 28a324e50c8a -r e81003cb9a98 multimedia/xine-lib/Makefile
--- a/multimedia/xine-lib/Makefile      Wed Feb 07 20:00:49 2007 +0000
+++ b/multimedia/xine-lib/Makefile      Wed Feb 07 20:04:00 2007 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2007/02/01 07:33:33 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2007/02/07 20:04:00 drochner Exp $
 
 .include "Makefile.common"
-PKGREVISION=           5
 
 COMMENT=               Multimedia player library
 
@@ -25,14 +24,16 @@
 # Needed to fix build problems under, at least, NetBSD/amd64.
 BUILDLINK_API_DEPENDS.libcdio+=        libcdio>=0.75
 
-.include "../../audio/flac/buildlink3.mk"
+# flac is supported internally; don't know what the plugin is good for
+#.include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../graphics/Mesa/buildlink3.mk"
-.include "../../graphics/aalib/buildlink3.mk"
+# these could be options or (better) extra plugin packages
+#.include "../../devel/SDL/buildlink3.mk"
+#.include "../../graphics/ImageMagick/buildlink3.mk"
+#.include "../../graphics/Mesa/buildlink3.mk"
+#.include "../../graphics/aalib/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
diff -r 28a324e50c8a -r e81003cb9a98 multimedia/xine-lib/Makefile.common
--- a/multimedia/xine-lib/Makefile.common       Wed Feb 07 20:00:49 2007 +0000
+++ b/multimedia/xine-lib/Makefile.common       Wed Feb 07 20:04:00 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2007/01/29 10:32:50 joerg Exp $
+# $NetBSD: Makefile.common,v 1.39 2007/02/07 20:04:00 drochner Exp $
 #
 
 DISTNAME=              xine-lib-${XINE_LIB_VER}
@@ -10,7 +10,7 @@
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://xinehq.de/
 
-XINE_LIB_VER=          1.1.3
+XINE_LIB_VER=          1.1.4
 PLIST_SUBST+=          XINE_LIB_VER=${XINE_LIB_VER:Q}
 
 DISTINFO_FILE=         ${.CURDIR}/../../multimedia/xine-lib/distinfo
diff -r 28a324e50c8a -r e81003cb9a98 multimedia/xine-lib/PLIST.common
--- a/multimedia/xine-lib/PLIST.common  Wed Feb 07 20:00:49 2007 +0000
+++ b/multimedia/xine-lib/PLIST.common  Wed Feb 07 20:04:00 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.17 2007/01/10 16:33:45 joerg Exp $
+@comment $NetBSD: PLIST.common,v 1.18 2007/02/07 20:04:00 drochner Exp $
 bin/xine-config
 include/xine.h
 include/xine/alphablend.h
@@ -72,8 +72,8 @@
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_ff.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_gsm610.a
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_gsm610.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_image.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_image.so
+@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_image.a
+@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_image.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_lpcm.a
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_lpcm.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_mad.a
@@ -120,8 +120,8 @@
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_games.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_iff.a
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_iff.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_image.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_image.so
+@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_image.a
+@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_image.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_matroska.a
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_matroska.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_mng.a
@@ -156,8 +156,6 @@
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_yuv4mpeg2.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_yuv_frames.a
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_flac.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_flac.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_cdda.a
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_cdda.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_dvb.a
@@ -184,14 +182,14 @@
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_vcd.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_vcdo.a
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_inp_vcdo.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_aa.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_aa.so
+@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_aa.a
+@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_aa.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_none.a
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_none.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_opengl.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_opengl.so
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_sdl.a
-lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_sdl.so
+@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_opengl.a
+@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_opengl.so
+@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_sdl.a
+@comment lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_sdl.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_xshm.a
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_xshm.so
 ${HAVE_XV}lib/xine/plugins/${XINE_LIB_VER}/xineplug_vo_out_xv.a
@@ -199,25 +197,25 @@
 man/man1/xine-config.1
 man/man5/xine.5
 share/aclocal/xine.m4
-share/doc/xine/README
-share/doc/xine/README.MINGWCROSS
-share/doc/xine/README.WIN32
-share/doc/xine/README.dvb
-share/doc/xine/README.dxr3
-share/doc/xine/README.freebsd
-share/doc/xine/README.irix
-share/doc/xine/README.network_dvd
-share/doc/xine/README.opengl
-share/doc/xine/README.solaris
-share/doc/xine/README.syncfb
-share/doc/xine/README_xxmc.html
-share/doc/xine/faq/faq.html
-share/doc/xine/faq/faq.txt
-share/doc/xine/hackersguide/architecture.png
-share/doc/xine/hackersguide/hackersguide.html
-share/doc/xine/hackersguide/library.png
-share/doc/xine/hackersguide/overlays.png
-share/doc/xine/hackersguide/post_frame.png
+share/doc/xine-lib/README
+share/doc/xine-lib/README.MINGWCROSS
+share/doc/xine-lib/README.WIN32
+share/doc/xine-lib/README.dvb
+share/doc/xine-lib/README.dxr3
+share/doc/xine-lib/README.freebsd
+share/doc/xine-lib/README.irix
+share/doc/xine-lib/README.network_dvd
+share/doc/xine-lib/README.opengl
+share/doc/xine-lib/README.solaris
+share/doc/xine-lib/README.syncfb
+share/doc/xine-lib/README_xxmc.html
+share/doc/xine-lib/faq.html
+share/doc/xine-lib/faq.txt
+share/doc/xine-lib/hackersguide/architecture.png
+share/doc/xine-lib/hackersguide/hackersguide.html
+share/doc/xine-lib/hackersguide/library.png
+share/doc/xine-lib/hackersguide/overlays.png
+share/doc/xine-lib/hackersguide/post_frame.png
 share/locale/cs/LC_MESSAGES/libxine1.mo
 share/locale/de/LC_MESSAGES/libxine1.mo
 share/locale/es/LC_MESSAGES/libxine1.mo
diff -r 28a324e50c8a -r e81003cb9a98 multimedia/xine-lib/PLIST.common_end
--- a/multimedia/xine-lib/PLIST.common_end      Wed Feb 07 20:00:49 2007 +0000
+++ b/multimedia/xine-lib/PLIST.common_end      Wed Feb 07 20:04:00 2007 +0000
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST.common_end,v 1.7 2006/08/06 10:36:50 wiz Exp $
+@comment $NetBSD: PLIST.common_end,v 1.8 2007/02/07 20:04:00 drochner 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
+@dirrm share/doc/xine-lib/hackersguide
+@dirrm share/doc/xine-lib
 @exec ${MKDIR} %D/lib/xine/plugins/${XINE_LIB_VER}/vidix
 @dirrm lib/xine/plugins/${XINE_LIB_VER}/vidix
 @dirrm lib/xine/plugins/${XINE_LIB_VER}/post
diff -r 28a324e50c8a -r e81003cb9a98 multimedia/xine-lib/buildlink3.mk
--- a/multimedia/xine-lib/buildlink3.mk Wed Feb 07 20:00:49 2007 +0000
+++ b/multimedia/xine-lib/buildlink3.mk Wed Feb 07 20:04:00 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2007/01/07 12:25:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2007/02/07 20:04:00 drochner Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 XINE_LIB_BUILDLINK3_MK:=       ${XINE_LIB_BUILDLINK3_MK}+
@@ -18,15 +18,4 @@
 BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib
 .endif # XINE_LIB_BUILDLINK3_MK
 
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/Mesa/buildlink3.mk"
-.include "../../graphics/aalib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/mng/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
diff -r 28a324e50c8a -r e81003cb9a98 multimedia/xine-lib/distinfo
--- a/multimedia/xine-lib/distinfo      Wed Feb 07 20:00:49 2007 +0000
+++ b/multimedia/xine-lib/distinfo      Wed Feb 07 20:04:00 2007 +0000
@@ -1,22 +1,22 @@
-$NetBSD: distinfo,v 1.43 2007/02/01 07:33:33 wiz Exp $
+$NetBSD: distinfo,v 1.44 2007/02/07 20:04:00 drochner Exp $
 
-SHA1 (xine-lib-1.1.3.tar.gz) = c0886910ddb1afa1a72572decf12c0251bba40bf
-RMD160 (xine-lib-1.1.3.tar.gz) = 8e28638385ea48e7d4d4d702573ca92c4eca77c8
-Size (xine-lib-1.1.3.tar.gz) = 8508884 bytes
+SHA1 (xine-lib-1.1.4.tar.gz) = d3e5b14a6cb1b9624334b215a84f3d18aa833a84
+RMD160 (xine-lib-1.1.4.tar.gz) = 81871160e302281b74b1730a8e3ef4bf76fd0721
+Size (xine-lib-1.1.4.tar.gz) = 8603909 bytes
 SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc
 SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9
 SHA1 (patch-ac) = e3c1a5eeb7c70e3a69035ccd667fc2115eec4969
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
 SHA1 (patch-ae) = faabcf1d34deee5d47ded9b210b37929f2635e2e
-SHA1 (patch-ag) = 3dcd17f807d21b19caed7b9d72b7437332b34fad
+SHA1 (patch-ag) = 592cbbcc27a9f07706808ca40573d2f184395ae1
 SHA1 (patch-ah) = ba408237d4a717cc91b5d06ede425048914a9a1f
 SHA1 (patch-ai) = f0b33c1a36082445a86bcf71e07a6210aa21b7dc
 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
 SHA1 (patch-ak) = 744f59d1b9e40983f25bb532db1a5d4e92be6fbe
 SHA1 (patch-al) = 9e3ad86a7d7f32e58de157fa37141138af10838e
 SHA1 (patch-an) = 14de05f8fcd857403078234190f2799ec0115b98
-SHA1 (patch-ao) = eabc0d33210aeb1c8469e761471e5bb8336c89b7
-SHA1 (patch-ap) = c84a3ca97a4615a1b389f49847c0eefe0ee0478f
+SHA1 (patch-ao) = 5643dbdf62225682bed242c0e3506b55945419b3
+SHA1 (patch-ap) = 151e3a8cc6503cf1dc9b78d8be6e362bbded0560
 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
 SHA1 (patch-av) = ff076273416fa701da325aa5060503ecb16a9ed1
 SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
@@ -25,10 +25,8 @@
 SHA1 (patch-bg) = 83f97ad77c8295fcaf78a7ea7fe9c4f87efd80d0
 SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81
 SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33
-SHA1 (patch-da) = d488fb2a1e454a4338bf599674035f9db09d8682
+SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d
 SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a
 SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
-SHA1 (patch-ea) = c691eed110cfbd60e0b6349d612d765ae6560e92
 SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23
-SHA1 (patch-ec) = edd039d574260dc96f78e0fc7e4324f3a74cc993
-SHA1 (patch-ed) = 2a33b25b58ff3746df3b8a55f24a78351b82055e
+SHA1 (patch-ee) = 49efc9d722f2141e88106d87414586ab80e4f5a9
diff -r 28a324e50c8a -r e81003cb9a98 multimedia/xine-lib/patches/patch-ag
--- a/multimedia/xine-lib/patches/patch-ag      Wed Feb 07 20:00:49 2007 +0000
+++ b/multimedia/xine-lib/patches/patch-ag      Wed Feb 07 20:04:00 2007 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.14 2006/12/08 09:24:26 abs Exp $
+$NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
 
---- configure.ac.orig  2006-11-05 15:16:56.000000000 +0000
+--- configure.ac.orig  2007-01-28 18:17:56.000000000 +0100
 +++ configure.ac
-@@ -221,7 +221,7 @@ AC_ARG_WITH(pthread-prefix, 
+@@ -220,7 +220,7 @@ AC_ARG_WITH(pthread-prefix, 
    [pthread_prefix="no"])
  
  case "$host" in
 -  *-*-freebsd*)
 +  *-*-freebsd* | *-*-dragonfly*)
-     if test x"$pthread_prefix" = "xno"; then
+     if test "x$pthread_prefix" = "xno"; then
        pthread_prefix="/usr/local"
      fi
-@@ -508,6 +508,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
+@@ -584,6 +584,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
  AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
  AC_SUBST(NET_LIBS)
  
@@ -21,34 +21,34 @@
  
  dnl ---------------------------------------------
  dnl socklen_t
-@@ -698,7 +701,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub"
+@@ -774,7 +777,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub"
  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" && test x$ac_have_xv == "xyes"; then
-+if test x$xxmc_stub = "xXvMCW" && test x$ac_have_xv = "xyes"; then
+-if test "x$xxmc_stub" == "xXvMCW" && test "x$ac_have_xv" == "xyes"; then
++if test "x$xxmc_stub" = "xXvMCW" && test "x$ac_have_xv" = "xyes"; then
        AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
                     ac_have_xxmc="yes",
                     [ac_have_xxmc="no"
-@@ -728,7 +731,7 @@ if test x$ac_have_xxmc = "xyes"; then
+@@ -804,7 +807,7 @@ if test "x$ac_have_xxmc" = "xyes"; then
  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
+ 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",