Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1466355784233040"
MIME-Version: 1.0
Date: Sun, 19 Jun 2016 17:03:04 +0000
From: "S.P.Zeidler" <spz@netbsd.org>
Subject: CVS commit: [pkgsrc-2016Q1] pkgsrc/multimedia/xine-lib
To: pkgsrc-changes@NetBSD.org
Reply-To: spz@netbsd.org
Message-Id: <20160619170304.E3A83FBB5@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1466355784233040
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	spz
Date:		Sun Jun 19 17:03:04 UTC 2016

Modified Files:
	pkgsrc/multimedia/xine-lib [pkgsrc-2016Q1]: Makefile PLIST.common
Added Files:
	pkgsrc/multimedia/xine-lib [pkgsrc-2016Q1]: options.mk

Log Message:
Pullup ticket #5043 - requested by jperkin
multimedia/xine-lib: dependency fix

Revisions pulled up:
- multimedia/xine-lib/Makefile                                  1.140
- multimedia/xine-lib/PLIST.common                              1.39
- multimedia/xine-lib/options.mk                                1.1-1.2

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	jperkin
   Date:		Tue Apr 19 10:41:14 UTC 2016

   Modified Files:
   	pkgsrc/multimedia/xine-lib: Makefile
   Added Files:
   	pkgsrc/multimedia/xine-lib: options.mk

   Log Message:
   Remove dependency on audio/faac (appears unused) and move audio/libdca
   dependency to options.mk, defaulting to disabled.  Both these packages
   are marked NO_BIN_ON_* so xine-lib couldn't previously be distributed
   in binary package sets.

   Bump PKGREVISION.

   To generate a diff of this commit:
   cvs rdiff -u -r1.139 -r1.140 pkgsrc/multimedia/xine-lib/Makefile
   cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/xine-lib/options.mk

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	jperkin
   Date:		Tue Apr 19 13:48:31 UTC 2016

   Modified Files:
   	pkgsrc/multimedia/xine-lib: PLIST.common options.mk

   Log Message:
   Handle dts PLIST entries correctly.

   To generate a diff of this commit:
   cvs rdiff -u -r1.38 -r1.39 pkgsrc/multimedia/xine-lib/PLIST.common
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/xine-lib/options.mk


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.139.4.1 pkgsrc/multimedia/xine-lib/Makefile
cvs rdiff -u -r1.38 -r1.38.16.1 pkgsrc/multimedia/xine-lib/PLIST.common
cvs rdiff -u -r0 -r1.2.2.2 pkgsrc/multimedia/xine-lib/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1466355784233040
Content-Disposition: inline
Content-Length: 3012
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/multimedia/xine-lib/Makefile
diff -u pkgsrc/multimedia/xine-lib/Makefile:1.139 pkgsrc/multimedia/xine-lib/Makefile:1.139.4.1
--- pkgsrc/multimedia/xine-lib/Makefile:1.139	Wed Nov 18 14:19:47 2015
+++ pkgsrc/multimedia/xine-lib/Makefile	Sun Jun 19 17:03:04 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.139 2015/11/18 14:19:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.139.4.1 2016/06/19 17:03:04 spz Exp $
 
-PKGREVISION= 3
+PKGREVISION= 4
 .include "Makefile.common"
 
 COMMENT=		Multimedia player library
@@ -55,13 +55,13 @@ PLIST.oss=	yes
 CPPFLAGS.SunOS+=	-D__u32=uint32_t -DHAVE_SYSI86 -DHAVE_MMX_FALSE
 LDFLAGS.SunOS+=		-lresolv
 
+.include "options.mk"
+
 # flac is supported internally; don't know what the plugin is good for
 # but until autodetection is turned off, force external flac for now.
 .include "../../audio/flac/buildlink3.mk"
-.include "../../audio/faac/buildlink3.mk"
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
-.include "../../audio/libdca/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 #.include "../../audio/libmpcdec/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"

Index: pkgsrc/multimedia/xine-lib/PLIST.common
diff -u pkgsrc/multimedia/xine-lib/PLIST.common:1.38 pkgsrc/multimedia/xine-lib/PLIST.common:1.38.16.1
--- pkgsrc/multimedia/xine-lib/PLIST.common:1.38	Thu Apr 17 13:53:47 2014
+++ pkgsrc/multimedia/xine-lib/PLIST.common	Sun Jun 19 17:03:04 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.38 2014/04/17 13:53:47 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.38.16.1 2016/06/19 17:03:04 spz Exp $
 bin/xine-config
 bin/xine-list-1.2
 include/xine.h
@@ -68,8 +68,8 @@ lib/xine/plugins/${XINE_MOD_DIR_VER}/xin
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_a52.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_bitplane.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_bitplane.so
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dts.a
-lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dts.so
+${PLIST.dts}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dts.a
+${PLIST.dts}lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dts.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dvaudio.a
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_dvaudio.so
 lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_decode_faad.a

Added files:

Index: pkgsrc/multimedia/xine-lib/options.mk
diff -u /dev/null pkgsrc/multimedia/xine-lib/options.mk:1.2.2.2
--- /dev/null	Sun Jun 19 17:03:04 2016
+++ pkgsrc/multimedia/xine-lib/options.mk	Sun Jun 19 17:03:04 2016
@@ -0,0 +1,16 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xine-lib
+
+PKG_SUPPORTED_OPTIONS=	dts
+
+.include "../../mk/bsd.options.mk"
+
+# Marked NO_BIN_ON_*.  Only enable if you don't want to distribute packages.
+PLIST_VARS+=		dts
+.if !empty(PKG_OPTIONS:Mdts)
+.include "../../audio/libdca/buildlink3.mk"
+PLIST.dts=		yes
+.else
+CONFIGURE_ARGS+=	--disable-dts
+.endif


--_----------=_1466355784233040--