CVS commit: pkgsrc/multimedia/xine-lib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 21 12:21:36 UTC 2016

Modified Files:
        pkgsrc/multimedia/xine-lib: Makefile distinfo
Added Files:
        pkgsrc/multimedia/xine-lib/patches: patch-src_input_input__dvd.c

Log Message:
Environment variable fix for libdvdcss 1.4.0 and later.

>From Rhialto in PR 51347.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 pkgsrc/multimedia/xine-lib/Makefile
cvs rdiff -u -r1.106 -r1.107 pkgsrc/multimedia/xine-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/xine-lib/patches/patch-src_input_input__dvd.c

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

Modified files:

Index: pkgsrc/multimedia/xine-lib/Makefile
diff -u pkgsrc/multimedia/xine-lib/Makefile:1.142 pkgsrc/multimedia/xine-lib/Makefile:1.143
--- pkgsrc/multimedia/xine-lib/Makefile:1.142   Sat Jul  9 06:38:40 2016
+++ pkgsrc/multimedia/xine-lib/Makefile Thu Jul 21 12:21:35 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.142 2016/07/09 06:38:40 wiz Exp $
+# $NetBSD: Makefile,v 1.143 2016/07/21 12:21:35 wiz Exp $
 
-PKGREVISION= 6
+PKGREVISION= 7
 .include "Makefile.common"
 
 COMMENT=               Multimedia player library

Index: pkgsrc/multimedia/xine-lib/distinfo
diff -u pkgsrc/multimedia/xine-lib/distinfo:1.106 pkgsrc/multimedia/xine-lib/distinfo:1.107
--- pkgsrc/multimedia/xine-lib/distinfo:1.106   Sun Jun 19 23:05:17 2016
+++ pkgsrc/multimedia/xine-lib/distinfo Thu Jul 21 12:21:35 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.106 2016/06/19 23:05:17 joerg Exp $
+$NetBSD: distinfo,v 1.107 2016/07/21 12:21:35 wiz Exp $
 
 SHA1 (xine-lib-1.2.6.tar.xz) = ac929eef2b7bf5c27699bbed612b953a01fccba5
 RMD160 (xine-lib-1.2.6.tar.xz) = 05edcd9a36e93d2fc9d1bf13cae3b32d4bd996da
@@ -25,6 +25,7 @@ SHA1 (patch-src-post-planar-expand.c) = 
 SHA1 (patch-src-post-planar-noise.c) = 2deabf5d80e2c45959a4f89bbf2528f7e1c9e1f5
 SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d
 SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d
+SHA1 (patch-src_input_input__dvd.c) = 9e491411a22e1f4467ce0e1aba83346305a1b6d3
 SHA1 (patch-src_video__out_Makefile.am) = 49a3c53da9cde55a96b5798cc32467f9334e2d76
 SHA1 (patch-src_video__out_macosx_Makefile.am) = 8350a75e3a4c0b2f684e07dcc18259fcc5b28115
 SHA1 (patch-src_xine-engine_Makefile.am) = e44ca141304e102faa40763ef083e8c1f60089e7

Added files:

Index: pkgsrc/multimedia/xine-lib/patches/patch-src_input_input__dvd.c
diff -u /dev/null pkgsrc/multimedia/xine-lib/patches/patch-src_input_input__dvd.c:1.1
--- /dev/null   Thu Jul 21 12:21:36 2016
+++ pkgsrc/multimedia/xine-lib/patches/patch-src_input_input__dvd.c     Thu Jul 21 12:21:36 2016
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_input_input__dvd.c,v 1.1 2016/07/21 12:21:36 wiz Exp $
+
+Environment variable fix for libdvdcss 1.4.0 and later.
+
+--- src/input/input_dvd.c.orig 2016-07-19 20:02:16.000000000 +0000
++++ src/input/input_dvd.c
+@@ -1401,7 +1401,11 @@ static int dvd_parse_try_open(dvd_input_
+     /* we have an alternative dvd_path */
+     intended_dvd_device = locator;
+     /* do not use the raw device for the alternative */
++#if 1  /* libdvdcss version 1.4.0 or later */
++    unsetenv("DVDCSS_RAW_DEVICE");
++#else
+     xine_setenv("DVDCSS_RAW_DEVICE", "", 1);
++#endif
+   } else {
+     /* use default DVD device */
+     dvd_input_class_t *class = (dvd_input_class_t*)this->input_plugin.input_class;