summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xine-lib/Makefile3
-rw-r--r--multimedia/xine-lib/Makefile.common8
-rw-r--r--multimedia/xine-lib/distinfo10
-rw-r--r--multimedia/xine-lib/patches/patch-ap8
4 files changed, 14 insertions, 15 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index fd40aa985d0..e3cd1568cc9 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.76 2010/01/18 09:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2010/04/13 15:09:40 drochner Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
COMMENT= Multimedia player library
-PKGREVISION= 2
BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 716f9929ca7..be8f7e8cee0 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.63 2009/12/14 11:47:44 drochner Exp $
+# $NetBSD: Makefile.common,v 1.64 2010/04/13 15:09:40 drochner Exp $
#
# used by audio/xine-arts/Makefile
# used by audio/xine-esound/Makefile
# used by audio/xine-pulse/Makefile
-DISTNAME= xine-lib-1.1.17
-XINE_PKGNAME= xine-lib-1.1.17
+DISTNAME= xine-lib-1.1.18.1
+XINE_PKGNAME= xine-lib-1.1.18.1
PKGNAME?= ${XINE_PKGNAME}
CATEGORIES?= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -15,7 +15,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://xinehq.de/
-XINE_MOD_DIR_VER= 1.27
+XINE_MOD_DIR_VER= 1.28
PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 5c594a4d46b..9bfcfb471e5 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.65 2009/12/09 10:13:03 drochner Exp $
+$NetBSD: distinfo,v 1.66 2010/04/13 15:09:40 drochner Exp $
-SHA1 (xine-lib-1.1.17.tar.bz2) = 2438e66bb571c8a4c981581188376687c42b72c4
-RMD160 (xine-lib-1.1.17.tar.bz2) = ecac0711431a94c74edaf8f00e696ade5ed0b6ee
-Size (xine-lib-1.1.17.tar.bz2) = 7528937 bytes
+SHA1 (xine-lib-1.1.18.1.tar.bz2) = 783232b6d6e23850a7ac97bf53b2a8bc2e743270
+RMD160 (xine-lib-1.1.18.1.tar.bz2) = caa05f16a58bb5ba438b6bd4605cdc2ed91c7201
+Size (xine-lib-1.1.18.1.tar.bz2) = 7530681 bytes
SHA1 (patch-aa) = 740b3132bcf27886632a6cfe126c3ca493d38c5b
SHA1 (patch-ab) = eb58985011ed97d61dc18ef648c97477558f2ad8
SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
@@ -14,7 +14,7 @@ SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508
SHA1 (patch-al) = b4bc97072b9615f026aee6ce3221dc97a045345a
SHA1 (patch-ao) = 2682548a181803bc2d79f79d76828b6b3ba0e4fa
-SHA1 (patch-ap) = 36f2bab3aa8c7d772960311d7ed71c95df68bf3f
+SHA1 (patch-ap) = f22810c78ac0d1bb7e958ed92fd2ad8a7f889d92
SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4
SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
SHA1 (patch-aw) = 52520d47bd9b5af313fab9a38e79f24f5c58d37c
diff --git a/multimedia/xine-lib/patches/patch-ap b/multimedia/xine-lib/patches/patch-ap
index edea0acb513..52e13f6d572 100644
--- a/multimedia/xine-lib/patches/patch-ap
+++ b/multimedia/xine-lib/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.8 2009/12/09 10:13:03 drochner Exp $
+$NetBSD: patch-ap,v 1.9 2010/04/13 15:09:40 drochner Exp $
---- src/dxr3/Makefile.am.orig 2009-11-30 22:12:44.000000000 +0100
+--- src/dxr3/Makefile.am.orig 2010-02-24 01:18:20.000000000 +0000
+++ src/dxr3/Makefile.am
@@ -17,6 +17,9 @@ endif
if HAVE_LIBRTE
@@ -10,9 +10,9 @@ $NetBSD: patch-ap,v 1.8 2009/12/09 10:13:03 drochner Exp $
+link_xinerama = -lXinerama
+endif
- xineplug_LTLIBRARIES = $(dxr3_modules)
+ EXTRA_DIST = compat.c
-@@ -43,7 +46,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
+@@ -45,7 +48,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
dxr3_scr.c \
video_out_dxr3.c