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.diff -r1.36 -r1.37 pkgsrc/multimedia/vlc2/Makefile
(drochner)
@@ -1,23 +1,22 @@ | @@ -1,23 +1,22 @@ | |||
1 | # $NetBSD: Makefile,v 1.36 2013/08/16 09:20:40 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.37 2013/08/23 12:45:50 drochner Exp $ | |
2 | 2 | |||
3 | DISTNAME= vlc-${VLC_VERSION} | 3 | DISTNAME= vlc-${VLC_VERSION} | |
4 | PKGREVISION= 1 | |||
5 | CATEGORIES= multimedia | 4 | CATEGORIES= multimedia | |
6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \ | 5 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \ | |
7 | http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ | 6 | http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ | |
8 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
9 | 8 | |||
10 | VLC_VERSION= 2.0.7 | 9 | VLC_VERSION= 2.0.8 | |
11 | 10 | |||
12 | MAINTAINER= pkgsrc-users@NetBSD.org | 11 | MAINTAINER= pkgsrc-users@NetBSD.org | |
13 | HOMEPAGE= http://www.videolan.org/ | 12 | HOMEPAGE= http://www.videolan.org/ | |
14 | COMMENT= VLC media player and streaming server | 13 | COMMENT= VLC media player and streaming server | |
15 | LICENSE= gnu-gpl-v2 | 14 | LICENSE= gnu-gpl-v2 | |
16 | 15 | |||
17 | CONFLICTS= vlc07-[0-9]* vlc08-[0-9]* | 16 | CONFLICTS= vlc07-[0-9]* vlc08-[0-9]* | |
18 | 17 | |||
19 | USE_LIBTOOL= yes | 18 | USE_LIBTOOL= yes | |
20 | USE_TOOLS+= gmake perl pkg-config \ | 19 | USE_TOOLS+= gmake perl pkg-config \ | |
21 | autoconf automake autoreconf | 20 | autoconf automake autoreconf | |
22 | # for autopoint | 21 | # for autopoint | |
23 | BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools | 22 | BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.10 2013/07/22 15:01:33 drochner Exp $ | 1 | @comment $NetBSD: PLIST,v 1.11 2013/08/23 12:45:50 drochner Exp $ | |
2 | bin/cvlc | 2 | bin/cvlc | |
3 | ${PLIST.x11}bin/qvlc | 3 | ${PLIST.x11}bin/qvlc | |
4 | bin/rvlc | 4 | bin/rvlc | |
5 | ${PLIST.skins}bin/svlc | 5 | ${PLIST.skins}bin/svlc | |
6 | bin/vlc | 6 | bin/vlc | |
7 | bin/vlc-wrapper | 7 | bin/vlc-wrapper | |
8 | include/vlc/deprecated.h | 8 | include/vlc/deprecated.h | |
9 | include/vlc/libvlc.h | 9 | include/vlc/libvlc.h | |
10 | include/vlc/libvlc_events.h | 10 | include/vlc/libvlc_events.h | |
11 | include/vlc/libvlc_media.h | 11 | include/vlc/libvlc_media.h | |
12 | include/vlc/libvlc_media_discoverer.h | 12 | include/vlc/libvlc_media_discoverer.h | |
13 | include/vlc/libvlc_media_library.h | 13 | include/vlc/libvlc_media_library.h | |
14 | include/vlc/libvlc_media_list.h | 14 | include/vlc/libvlc_media_list.h | |
@@ -444,26 +444,27 @@ share/locale/he/LC_MESSAGES/vlc.mo | @@ -444,26 +444,27 @@ share/locale/he/LC_MESSAGES/vlc.mo | |||
444 | share/locale/hi/LC_MESSAGES/vlc.mo | 444 | share/locale/hi/LC_MESSAGES/vlc.mo | |
445 | share/locale/hr/LC_MESSAGES/vlc.mo | 445 | share/locale/hr/LC_MESSAGES/vlc.mo | |
446 | share/locale/hu/LC_MESSAGES/vlc.mo | 446 | share/locale/hu/LC_MESSAGES/vlc.mo | |
447 | share/locale/hy/LC_MESSAGES/vlc.mo | 447 | share/locale/hy/LC_MESSAGES/vlc.mo | |
448 | share/locale/ia/LC_MESSAGES/vlc.mo | 448 | share/locale/ia/LC_MESSAGES/vlc.mo | |
449 | share/locale/id/LC_MESSAGES/vlc.mo | 449 | share/locale/id/LC_MESSAGES/vlc.mo | |
450 | share/locale/is/LC_MESSAGES/vlc.mo | 450 | share/locale/is/LC_MESSAGES/vlc.mo | |
451 | share/locale/it/LC_MESSAGES/vlc.mo | 451 | share/locale/it/LC_MESSAGES/vlc.mo | |
452 | share/locale/ja/LC_MESSAGES/vlc.mo | 452 | share/locale/ja/LC_MESSAGES/vlc.mo | |
453 | share/locale/ka/LC_MESSAGES/vlc.mo | 453 | share/locale/ka/LC_MESSAGES/vlc.mo | |
454 | share/locale/kk/LC_MESSAGES/vlc.mo | 454 | share/locale/kk/LC_MESSAGES/vlc.mo | |
455 | share/locale/km/LC_MESSAGES/vlc.mo | 455 | share/locale/km/LC_MESSAGES/vlc.mo | |
456 | share/locale/kmr/LC_MESSAGES/vlc.mo | 456 | share/locale/kmr/LC_MESSAGES/vlc.mo | |
457 | share/locale/kn/LC_MESSAGES/vlc.mo | |||
457 | share/locale/ko/LC_MESSAGES/vlc.mo | 458 | share/locale/ko/LC_MESSAGES/vlc.mo | |
458 | share/locale/ky/LC_MESSAGES/vlc.mo | 459 | share/locale/ky/LC_MESSAGES/vlc.mo | |
459 | share/locale/lg/LC_MESSAGES/vlc.mo | 460 | share/locale/lg/LC_MESSAGES/vlc.mo | |
460 | share/locale/lt/LC_MESSAGES/vlc.mo | 461 | share/locale/lt/LC_MESSAGES/vlc.mo | |
461 | share/locale/lv/LC_MESSAGES/vlc.mo | 462 | share/locale/lv/LC_MESSAGES/vlc.mo | |
462 | share/locale/mk/LC_MESSAGES/vlc.mo | 463 | share/locale/mk/LC_MESSAGES/vlc.mo | |
463 | share/locale/ml/LC_MESSAGES/vlc.mo | 464 | share/locale/ml/LC_MESSAGES/vlc.mo | |
464 | share/locale/mn/LC_MESSAGES/vlc.mo | 465 | share/locale/mn/LC_MESSAGES/vlc.mo | |
465 | share/locale/mr/LC_MESSAGES/vlc.mo | 466 | share/locale/mr/LC_MESSAGES/vlc.mo | |
466 | share/locale/ms/LC_MESSAGES/vlc.mo | 467 | share/locale/ms/LC_MESSAGES/vlc.mo | |
467 | share/locale/my/LC_MESSAGES/vlc.mo | 468 | share/locale/my/LC_MESSAGES/vlc.mo | |
468 | share/locale/nb/LC_MESSAGES/vlc.mo | 469 | share/locale/nb/LC_MESSAGES/vlc.mo | |
469 | share/locale/ne/LC_MESSAGES/vlc.mo | 470 | share/locale/ne/LC_MESSAGES/vlc.mo |
@@ -1,27 +1,26 @@ | @@ -1,27 +1,26 @@ | |||
1 | $NetBSD: distinfo,v 1.19 2013/07/22 15:01:33 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.20 2013/08/23 12:45:50 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (vlc-2.0.7.tar.xz) = d3dc6605cc296806ada16b5f9b819705c9cc1319 | 3 | SHA1 (vlc-2.0.8.tar.xz) = 8937ed30412bef49db77d2187a9e4734866f8ab7 | |
4 | RMD160 (vlc-2.0.7.tar.xz) = 0e708e577e3176c8acd7ac8cdcf1676df7f81381 | 4 | RMD160 (vlc-2.0.8.tar.xz) = cd2483e4447b8bc4a91dbcf95ff1213244dcf40f | |
5 | Size (vlc-2.0.7.tar.xz) = 18538256 bytes | 5 | Size (vlc-2.0.8.tar.xz) = 18858236 bytes | |
6 | SHA1 (patch-aa) = 46003ac47b0b0ab97f481cbd755d48f624b0fa87 | 6 | SHA1 (patch-aa) = 46003ac47b0b0ab97f481cbd755d48f624b0fa87 | |
7 | SHA1 (patch-ab) = 7833e9d1e023f53dd1125af5049eb9d74b733905 | 7 | SHA1 (patch-ab) = 7833e9d1e023f53dd1125af5049eb9d74b733905 | |
8 | SHA1 (patch-ac) = 9cdb4bdad7f8e6a09e35b5a1142350d47d77f270 | 8 | SHA1 (patch-ac) = 9cdb4bdad7f8e6a09e35b5a1142350d47d77f270 | |
9 | SHA1 (patch-ad) = bfcca3f794bc5dac7366210b4548ab45d23040d8 | 9 | SHA1 (patch-ad) = bfcca3f794bc5dac7366210b4548ab45d23040d8 | |
10 | SHA1 (patch-ae) = 91cf64607a33dab18cd2d92464ab9731008f6a68 | 10 | SHA1 (patch-ae) = 91cf64607a33dab18cd2d92464ab9731008f6a68 | |
11 | SHA1 (patch-af) = 8c9de1d74252ae3232bf2ac6755057ccef650228 | 11 | SHA1 (patch-af) = 8c9de1d74252ae3232bf2ac6755057ccef650228 | |
12 | SHA1 (patch-ag) = 9fd4a1d0a43b7032b2db6597ac21fd609631733c | 12 | SHA1 (patch-ag) = 9fd4a1d0a43b7032b2db6597ac21fd609631733c | |
13 | SHA1 (patch-ah) = 7eb1bb9ff4ab55317ca4c2ab3669208dce70a9e3 | 13 | SHA1 (patch-ah) = 7eb1bb9ff4ab55317ca4c2ab3669208dce70a9e3 | |
14 | SHA1 (patch-ai) = 83d3aa9aa048aa81671640334b3b2c9d4f44a495 | 14 | SHA1 (patch-ai) = 83d3aa9aa048aa81671640334b3b2c9d4f44a495 | |
15 | SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3 | 15 | SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3 | |
16 | SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086 | 16 | SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086 | |
17 | SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef | 17 | SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef | |
18 | SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b | 18 | SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b | |
19 | SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6 | 19 | SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6 | |
20 | SHA1 (patch-ba) = 1898a7a9bf6a45ab4915f1c46df325e6d41ada23 | 20 | SHA1 (patch-ba) = 1898a7a9bf6a45ab4915f1c46df325e6d41ada23 | |
21 | SHA1 (patch-ca) = 239816c276f469f755770899226caacc32727bd5 | 21 | SHA1 (patch-ca) = 6aa8487047b3b8d5417ba9e3195729980b2b6b9c | |
22 | SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f7a | 22 | SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f7a | |
23 | SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3 | 23 | SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3 | |
24 | SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15 | 24 | SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15 | |
25 | SHA1 (patch-modules_codec_flac.c) = 6c4917ee99d8fb6e2d7bd6760793b49fe5548370 | |||
26 | SHA1 (patch-modules_misc_gnutls.c) = 7ab9df9f8b31ea7a7c8e302876d0e6c4e6882c30 | 25 | SHA1 (patch-modules_misc_gnutls.c) = 7ab9df9f8b31ea7a7c8e302876d0e6c4e6882c30 | |
27 | SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b | 26 | SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b |
@@ -1,32 +1,42 @@ | @@ -1,32 +1,42 @@ | |||
1 | $NetBSD: patch-ca,v 1.1 2013/07/22 15:01:33 drochner Exp $ | 1 | $NetBSD: patch-ca,v 1.2 2013/08/23 12:45:50 drochner Exp $ | |
2 | 2 | |||
3 | if !HAVE_USELOCALE, just define "uselocale", nothing else | 3 | on NetBSD-current, just define "uselocale", nothing else | |
4 | fixes build on NetBSD | 4 | fixes build | |
5 | 5 | |||
6 | --- include/vlc_fixups.h.orig 2013-06-29 12:47:02.000000000 +0000 | 6 | --- include/vlc_fixups.h.orig 2013-08-23 11:39:38.000000000 +0000 | |
7 | +++ include/vlc_fixups.h | 7 | +++ include/vlc_fixups.h | |
8 | @@ -210,23 +210,12 @@ int unsetenv (const char *); | 8 | @@ -210,14 +210,26 @@ int unsetenv (const char *); | |
9 | 9 | |||
10 | /* locale.h */ | 10 | /* locale.h */ | |
11 | #ifndef HAVE_USELOCALE | 11 | #ifndef HAVE_USELOCALE | |
12 | -#define LC_NUMERIC_MASK 0 | 12 | +#ifdef __NetBSD__ | |
13 | -#define LC_MESSAGES_MASK 0 | 13 | +#include <sys/param.h> | |
14 | -typedef void *locale_t; | 14 | +#if __NetBSD_Version__ >= 699002300 | |
15 | +/* NetBSD-current has locale_t but no uselocale */ | |||
16 | +#define NetBSD_LOCALE_HACK | |||
17 | +#endif | |||
18 | +#endif | |||
19 | +#ifdef NetBSD_LOCALE_HACK | |||
15 | +#include <locale.h> | 20 | +#include <locale.h> | |
21 | +#else | |||
22 | #define LC_NUMERIC_MASK 0 | |||
23 | #define LC_MESSAGES_MASK 0 | |||
24 | typedef void *locale_t; | |||
25 | +#endif | |||
16 | static inline locale_t uselocale(locale_t loc) | 26 | static inline locale_t uselocale(locale_t loc) | |
17 | { | 27 | { | |
18 | (void)loc; | 28 | (void)loc; | |
19 | return NULL; | 29 | return NULL; | |
20 | } | 30 | } | |
21 | -static inline void freelocale(locale_t loc) | 31 | +#ifndef NetBSD_LOCALE_HACK | |
22 | -{ | 32 | static inline void freelocale(locale_t loc) | |
23 | - (void)loc; | 33 | { | |
24 | -} | 34 | (void)loc; | |
25 | -static inline locale_t newlocale(int mask, const char * locale, locale_t base) | 35 | @@ -228,6 +240,7 @@ static inline locale_t newlocale(int mas | |
26 | -{ | 36 | return NULL; | |
27 | - (void)mask; (void)locale; (void)base; | 37 | } | |
28 | - return NULL; | |||
29 | -} | |||
30 | #endif | 38 | #endif | |
39 | +#endif | |||
31 | 40 | |||
32 | /* Alignment of critical static data structures */ | 41 | /* Alignment of critical static data structures */ | |
42 | #ifdef ATTRIBUTE_ALIGNED_MAX |