diff options
-rw-r--r-- | multimedia/xine-lib/Makefile | 4 | ||||
-rw-r--r-- | multimedia/xine-lib/Makefile.common | 10 | ||||
-rw-r--r-- | multimedia/xine-lib/distinfo | 13 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-av | 8 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ay | 17 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-fa | 8 |
6 files changed, 20 insertions, 40 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 912b35e113a..ba1ce3002d7 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.59 2008/05/26 12:35:09 drochner Exp $ +# $NetBSD: Makefile,v 1.60 2008/06/21 15:45:15 drochner Exp $ .include "Makefile.common" -PKGREVISION= 2 - COMMENT= Multimedia player library BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index f7dc9b42581..5df419e1873 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.51 2008/05/20 18:29:28 tnn Exp $ +# $NetBSD: Makefile.common,v 1.52 2008/06/21 15:45:16 drochner Exp $ # # used by audio/xine-arts/Makefile # used by audio/xine-esound/Makefile -DISTNAME= xine-lib-1.1.12 -XINE_PKGNAME= xine-lib-1.1.12 +DISTNAME= xine-lib-1.1.13 +XINE_PKGNAME= xine-lib-1.1.13 PKGNAME?= ${XINE_PKGNAME} CATEGORIES?= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} @@ -14,8 +14,8 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xinehq.de/ -XINE_LIB_VER= 1.1.12 -XINE_MOD_DIR_VER= 1.21 +XINE_LIB_VER= 1.1.13 +XINE_MOD_DIR_VER= 1.22 PLIST_SUBST+= XINE_LIB_VER=${XINE_LIB_VER:Q} PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q} diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 5cd070ec6a4..6fe96920aa4 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.56 2008/05/26 12:35:10 drochner Exp $ +$NetBSD: distinfo,v 1.57 2008/06/21 15:45:16 drochner Exp $ -SHA1 (xine-lib-1.1.12.tar.bz2) = a27872a4292e2ce6c35018a1cbbf7a88eecda8cd -RMD160 (xine-lib-1.1.12.tar.bz2) = 305c1b3787a4191083b9793281ce3f3043d65fcb -Size (xine-lib-1.1.12.tar.bz2) = 7431443 bytes +SHA1 (xine-lib-1.1.13.tar.bz2) = d1f4cf0511067a554dbe243468311ebeb3bbdce4 +RMD160 (xine-lib-1.1.13.tar.bz2) = a2ffcb43890ec525115e62f796dec6e835ceb4d5 +Size (xine-lib-1.1.13.tar.bz2) = 7444294 bytes SHA1 (patch-aa) = e09d34a121080b03bc67b2d8a3ca27463b771acc SHA1 (patch-ab) = ef13b60c2bea54f354acf1b2d70c04594dac36c9 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 @@ -17,10 +17,9 @@ SHA1 (patch-ao) = 0fa0c3969e2c3fd83e36db028d84bb7b8668c133 SHA1 (patch-ap) = e4801863b0d4625fe6db9e4c51218f55b90c6100 SHA1 (patch-aq) = f6efa28ab1b9a24b79c18c181a5d309db53172e4 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 -SHA1 (patch-av) = acbb2ffbaf72b4744538d996be95321e8eb23fd9 +SHA1 (patch-av) = 4d9bb65a9626c080817904fcd360a7850dc99f60 SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc SHA1 (patch-ax) = 71f2619aa750a51a641922d482b29ea998e8ab48 -SHA1 (patch-ay) = a4079a11f4a399010408e146684b878cd5eb584a SHA1 (patch-be) = e1a0856361c26d924ce12794e9f7eb0174857100 SHA1 (patch-bg) = 10eb076d087a40ac5f7920794ff7b34f2aa0495b SHA1 (patch-cb) = 08d9920022988d2764d941cfa8b1aa5602a0ec81 @@ -29,5 +28,5 @@ SHA1 (patch-da) = f79701d7c036e78d760c12119d88fe3f0dd1762d SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23 -SHA1 (patch-fa) = a69fe09588596bfc3d74fad29e5a1aeeeead4dfd +SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c SHA1 (patch-fb) = 9d9fd6fee4f4dbb8f509117e07ab9248ea1625e2 diff --git a/multimedia/xine-lib/patches/patch-av b/multimedia/xine-lib/patches/patch-av index c9c49fb2308..874f01da1bf 100644 --- a/multimedia/xine-lib/patches/patch-av +++ b/multimedia/xine-lib/patches/patch-av @@ -1,11 +1,11 @@ -$NetBSD: patch-av,v 1.7 2008/04/10 11:48:58 drochner Exp $ +$NetBSD: patch-av,v 1.8 2008/06/21 15:45:16 drochner Exp $ ---- src/libspudvb/Makefile.in.orig 2008-03-19 14:15:53.000000000 +0100 +--- src/libspudvb/Makefile.in.orig 2008-06-15 01:15:55.000000000 +0200 +++ src/libspudvb/Makefile.in -@@ -240,7 +240,7 @@ MNG_LIBS = @MNG_LIBS@ - MSGFMT = @MSGFMT@ +@@ -242,7 +242,7 @@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NET_LIBS = @NET_LIBS@ + NMEDIT = @NMEDIT@ -NOUNDEF = @NOUNDEF@ +#NOUNDEF = @NOUNDEF@ OBJC = @OBJC@ diff --git a/multimedia/xine-lib/patches/patch-ay b/multimedia/xine-lib/patches/patch-ay deleted file mode 100644 index 2f97e27e218..00000000000 --- a/multimedia/xine-lib/patches/patch-ay +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ay,v 1.5 2008/04/18 14:01:22 drochner Exp $ - ---- src/demuxers/demux_nsf.c.orig 2008-04-18 15:12:10.000000000 +0200 -+++ src/demuxers/demux_nsf.c -@@ -106,9 +106,9 @@ static int open_nsf_file(demux_nsf_t *th - - this->total_songs = header[6]; - this->current_song = header[7]; -- this->title = strdup(&header[0x0E]); -- this->artist = strdup(&header[0x2E]); -- this->copyright = strdup(&header[0x4E]); -+ this->title = strndup((char*)&header[0x0E], 0x20); -+ this->artist = strndup((char*)&header[0x2E], 0x20); -+ this->copyright = strndup((char*)&header[0x4E], 0x20); - - this->filesize = this->input->get_length(this->input); - diff --git a/multimedia/xine-lib/patches/patch-fa b/multimedia/xine-lib/patches/patch-fa index dccf4f04d0c..3dead9215ed 100644 --- a/multimedia/xine-lib/patches/patch-fa +++ b/multimedia/xine-lib/patches/patch-fa @@ -1,9 +1,9 @@ -$NetBSD: patch-fa,v 1.1 2008/01/11 16:05:27 drochner Exp $ +$NetBSD: patch-fa,v 1.2 2008/06/21 15:45:16 drochner Exp $ ---- m4/pthreads.m4.orig 2008-01-10 16:56:36.000000000 +0100 +--- m4/pthreads.m4.orig 2008-06-15 01:15:00.000000000 +0200 +++ m4/pthreads.m4 -@@ -37,6 +37,9 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ - esac +@@ -43,6 +43,9 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ + fi fi +dnl compensate for pkgsrc pthread.bl3 smartness |