summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2013-08-23 12:45:50 +0000
committerdrochner <drochner@pkgsrc.org>2013-08-23 12:45:50 +0000
commit84de8aa9b03f023d94c67333e1bf7a60960aa452 (patch)
tree0329c952ea71b72a60d750d1ecd680dbb23fca02 /multimedia
parent009dfd7785e428d91c9ecbc42ef5d6971ce3b4b8 (diff)
downloadpkgsrc-84de8aa9b03f023d94c67333e1bf7a60960aa452.tar.gz
update to 2.0.8
from the announcement: 2.0.8 is a small update that fixes some regressions of the 2.0.x branch of VLC. 2.0.8 fixes numerous crashes and dangerous behaviors. 2.0.8 also fixes ISDB-S tunning and some OSX issues.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/vlc2/Makefile5
-rw-r--r--multimedia/vlc2/PLIST3
-rw-r--r--multimedia/vlc2/distinfo11
-rw-r--r--multimedia/vlc2/patches/patch-ca44
-rw-r--r--multimedia/vlc2/patches/patch-modules_codec_flac.c15
5 files changed, 36 insertions, 42 deletions
diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile
index 8631a7a196b..9a85ad94487 100644
--- a/multimedia/vlc2/Makefile
+++ b/multimedia/vlc2/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.36 2013/08/16 09:20:40 obache Exp $
+# $NetBSD: Makefile,v 1.37 2013/08/23 12:45:50 drochner Exp $
DISTNAME= vlc-${VLC_VERSION}
-PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \
http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
EXTRACT_SUFX= .tar.xz
-VLC_VERSION= 2.0.7
+VLC_VERSION= 2.0.8
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.videolan.org/
diff --git a/multimedia/vlc2/PLIST b/multimedia/vlc2/PLIST
index 792a43ba590..7e7b9b9a651 100644
--- a/multimedia/vlc2/PLIST
+++ b/multimedia/vlc2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2013/07/22 15:01:33 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2013/08/23 12:45:50 drochner Exp $
bin/cvlc
${PLIST.x11}bin/qvlc
bin/rvlc
@@ -454,6 +454,7 @@ share/locale/ka/LC_MESSAGES/vlc.mo
share/locale/kk/LC_MESSAGES/vlc.mo
share/locale/km/LC_MESSAGES/vlc.mo
share/locale/kmr/LC_MESSAGES/vlc.mo
+share/locale/kn/LC_MESSAGES/vlc.mo
share/locale/ko/LC_MESSAGES/vlc.mo
share/locale/ky/LC_MESSAGES/vlc.mo
share/locale/lg/LC_MESSAGES/vlc.mo
diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo
index 91fa9d8e9ce..4e005ccb514 100644
--- a/multimedia/vlc2/distinfo
+++ b/multimedia/vlc2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2013/07/22 15:01:33 drochner Exp $
+$NetBSD: distinfo,v 1.20 2013/08/23 12:45:50 drochner Exp $
-SHA1 (vlc-2.0.7.tar.xz) = d3dc6605cc296806ada16b5f9b819705c9cc1319
-RMD160 (vlc-2.0.7.tar.xz) = 0e708e577e3176c8acd7ac8cdcf1676df7f81381
-Size (vlc-2.0.7.tar.xz) = 18538256 bytes
+SHA1 (vlc-2.0.8.tar.xz) = 8937ed30412bef49db77d2187a9e4734866f8ab7
+RMD160 (vlc-2.0.8.tar.xz) = cd2483e4447b8bc4a91dbcf95ff1213244dcf40f
+Size (vlc-2.0.8.tar.xz) = 18858236 bytes
SHA1 (patch-aa) = 46003ac47b0b0ab97f481cbd755d48f624b0fa87
SHA1 (patch-ab) = 7833e9d1e023f53dd1125af5049eb9d74b733905
SHA1 (patch-ac) = 9cdb4bdad7f8e6a09e35b5a1142350d47d77f270
@@ -18,10 +18,9 @@ SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef
SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b
SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6
SHA1 (patch-ba) = 1898a7a9bf6a45ab4915f1c46df325e6d41ada23
-SHA1 (patch-ca) = 239816c276f469f755770899226caacc32727bd5
+SHA1 (patch-ca) = 6aa8487047b3b8d5417ba9e3195729980b2b6b9c
SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f7a
SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3
SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15
-SHA1 (patch-modules_codec_flac.c) = 6c4917ee99d8fb6e2d7bd6760793b49fe5548370
SHA1 (patch-modules_misc_gnutls.c) = 7ab9df9f8b31ea7a7c8e302876d0e6c4e6882c30
SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b
diff --git a/multimedia/vlc2/patches/patch-ca b/multimedia/vlc2/patches/patch-ca
index b4deb53ae5c..6261e36b189 100644
--- a/multimedia/vlc2/patches/patch-ca
+++ b/multimedia/vlc2/patches/patch-ca
@@ -1,32 +1,42 @@
-$NetBSD: patch-ca,v 1.1 2013/07/22 15:01:33 drochner Exp $
+$NetBSD: patch-ca,v 1.2 2013/08/23 12:45:50 drochner Exp $
-if !HAVE_USELOCALE, just define "uselocale", nothing else
-fixes build on NetBSD
+on NetBSD-current, just define "uselocale", nothing else
+fixes build
---- include/vlc_fixups.h.orig 2013-06-29 12:47:02.000000000 +0000
+--- include/vlc_fixups.h.orig 2013-08-23 11:39:38.000000000 +0000
+++ include/vlc_fixups.h
-@@ -210,23 +210,12 @@ int unsetenv (const char *);
+@@ -210,14 +210,26 @@ int unsetenv (const char *);
/* locale.h */
#ifndef HAVE_USELOCALE
--#define LC_NUMERIC_MASK 0
--#define LC_MESSAGES_MASK 0
--typedef void *locale_t;
++#ifdef __NetBSD__
++#include <sys/param.h>
++#if __NetBSD_Version__ >= 699002300
++/* NetBSD-current has locale_t but no uselocale */
++#define NetBSD_LOCALE_HACK
++#endif
++#endif
++#ifdef NetBSD_LOCALE_HACK
+#include <locale.h>
++#else
+ #define LC_NUMERIC_MASK 0
+ #define LC_MESSAGES_MASK 0
+ typedef void *locale_t;
++#endif
static inline locale_t uselocale(locale_t loc)
{
(void)loc;
return NULL;
}
--static inline void freelocale(locale_t loc)
--{
-- (void)loc;
--}
--static inline locale_t newlocale(int mask, const char * locale, locale_t base)
--{
-- (void)mask; (void)locale; (void)base;
-- return NULL;
--}
++#ifndef NetBSD_LOCALE_HACK
+ static inline void freelocale(locale_t loc)
+ {
+ (void)loc;
+@@ -228,6 +240,7 @@ static inline locale_t newlocale(int mas
+ return NULL;
+ }
#endif
++#endif
/* Alignment of critical static data structures */
+ #ifdef ATTRIBUTE_ALIGNED_MAX
diff --git a/multimedia/vlc2/patches/patch-modules_codec_flac.c b/multimedia/vlc2/patches/patch-modules_codec_flac.c
deleted file mode 100644
index 3723682a963..00000000000
--- a/multimedia/vlc2/patches/patch-modules_codec_flac.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-modules_codec_flac.c,v 1.1 2013/06/15 23:05:36 wiz Exp $
-
---- modules/codec/flac.c.orig 2013-01-25 12:30:14.000000000 +0000
-+++ modules/codec/flac.c
-@@ -38,8 +38,8 @@
- #include <vlc_codec.h>
- #include <vlc_aout.h>
-
--#include <stream_decoder.h>
--#include <stream_encoder.h>
-+#include <FLAC/stream_decoder.h>
-+#include <FLAC/stream_encoder.h>
-
- #include <vlc_block_helper.h>
- #include <vlc_bits.h>