summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorhe <he@pkgsrc.org>2017-12-30 11:12:01 +0000
committerhe <he@pkgsrc.org>2017-12-30 11:12:01 +0000
commite5f769418c7b6d7823acb4c9868bca70f1ff85b2 (patch)
tree0fdb242bca932f911288bfde937e6fbc5d121d5b /multimedia
parentd494b53cf7bc13e2617004707a4e246d57f71e47 (diff)
downloadpkgsrc-e5f769418c7b6d7823acb4c9868bca70f1ff85b2.tar.gz
Newer gcc doesn't like non-defined but declared inlines.
Just skip -Werror to avoid the problem for the internal faad library. Bump PKGREVISION.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/libmp4v2/Makefile4
-rw-r--r--multimedia/libmp4v2/distinfo3
-rw-r--r--multimedia/libmp4v2/patches/patch-player_lib_audio_faad_Makefile.in16
3 files changed, 20 insertions, 3 deletions
diff --git a/multimedia/libmp4v2/Makefile b/multimedia/libmp4v2/Makefile
index 1ac90f98342..f61f242921d 100644
--- a/multimedia/libmp4v2/Makefile
+++ b/multimedia/libmp4v2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2017/12/19 10:08:14 markd Exp $
+# $NetBSD: Makefile,v 1.20 2017/12/30 11:12:01 he Exp $
DISTNAME= mpeg4ip-1.6.1
PKGNAME= libmp4v2-1.6.1
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= multimedia
# distfile at sf is corrupt
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpeg4ip/}
diff --git a/multimedia/libmp4v2/distinfo b/multimedia/libmp4v2/distinfo
index 7d00509ddff..926e2088b5a 100644
--- a/multimedia/libmp4v2/distinfo
+++ b/multimedia/libmp4v2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2017/12/19 10:08:14 markd Exp $
+$NetBSD: distinfo,v 1.19 2017/12/30 11:12:01 he Exp $
SHA1 (mpeg4ip-1.6.1.tar.gz) = 2af97fc0da6a5c0bcb7b433c6715967487b80e38
RMD160 (mpeg4ip-1.6.1.tar.gz) = ee8375d9581cccbbf685f730bb36f3866eaf12f7
@@ -90,6 +90,7 @@ SHA1 (patch-lib_mp4v2_mp4atom.cpp) = ad0a1006293d8bea250de695919d8cdc59a7a4fa
SHA1 (patch-lib_mp4v2_rtphint.cpp) = 670c658388b1b7b8e57e02971560ca18e89d48d0
SHA1 (patch-lib_rtp_net__udp.c) = 3250d0ebcc0899ec4521eb20bc83f6e8a8bce3c9
SHA1 (patch-lib_utils_config__opts.cpp) = 15a385df3635b9441ceacf898031ce0a94d1cd0e
+SHA1 (patch-player_lib_audio_faad_Makefile.in) = 7da79ebe1bd23b4b711f9f821529983af04db5e0
SHA1 (patch-player_lib_audio_faad_config.c) = 6448e02ed9f95fc94bca986958ac61c0bf0ec752
SHA1 (patch-player_lib_audio_faad_huffdec.c) = 1106e902c3fe95cb76009613ae6641339580adac
SHA1 (patch-player_lib_audio_faad_monopred.c) = 0833f17e10f91b69c63c896c15e98471c62f3025
diff --git a/multimedia/libmp4v2/patches/patch-player_lib_audio_faad_Makefile.in b/multimedia/libmp4v2/patches/patch-player_lib_audio_faad_Makefile.in
new file mode 100644
index 00000000000..eea2fceaf36
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-player_lib_audio_faad_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-player_lib_audio_faad_Makefile.in,v 1.1 2017/12/30 11:12:01 he Exp $
+
+Newer gcc doesn't like non-defined declared inlines.
+Just skip -Werror to avoid the problem.
+
+--- player/lib/audio/faad/Makefile.in.orig 2017-12-22 19:19:38.939099764 +0000
++++ player/lib/audio/faad/Makefile.in
+@@ -293,7 +293,7 @@ libmpeg4ip_faad_la_SOURCES = \
+ util.h
+
+ INCLUDES = -I$(top_srcdir)/include
+-AM_CFLAGS = -O2 -Werror -Wall -fexceptions -fno-strict-aliasing
++AM_CFLAGS = -O2 -Wall -fexceptions -fno-strict-aliasing
+ EXTRA_DIST = COPYING libfaad60.dsp README libfaad.vcproj
+ all: all-am
+