Update to gstreamer1-plugins-libav-1.6.0.

This commit is contained in:
ajacoutot 2015-09-27 08:22:42 +00:00
parent 0a17f4f3fe
commit 7a4eea8b7c
6 changed files with 23 additions and 39 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.26 2015/06/15 14:39:39 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.27 2015/09/27 08:22:42 ajacoutot Exp $
COMMENT= ffmpeg elements for GStreamer
DISTNAME= gst-libav-${V}
PKGNAME= ${GST_PKGNAME_PREFIX}-plugins-libav-${V}
REVISION= 1
# sync with graphics/ffmpeg
PERMIT_PACKAGE_CDROM= patents
@ -12,7 +11,7 @@ PERMIT_PACKAGE_FTP= Yes
WANTLIB += bz2 ffi glib-2.0 gmodule-2.0 gobject-2.0 gstaudio-1.0
WANTLIB += gstbase-1.0 gstpbutils-1.0 gstreamer-1.0 gsttag-1.0
WANTLIB += gstvideo-1.0 m orc-0.4 pcre pthread z
WANTLIB += gstvideo-1.0 lzma m orc-0.4 pcre pthread z
MASTER_SITES= ${MASTER_SITE_GST:=gst-libav/}

View File

@ -1,2 +1,2 @@
SHA256 (gstreamer/gst-libav-1.4.5.tar.xz) = YFxiYkYE87tchwhEzB8nEXecxTOwBMKqHYwNWFV6+7w=
SIZE (gstreamer/gst-libav-1.4.5.tar.xz) = 5220508
SHA256 (gstreamer/gst-libav-1.6.0.tar.xz) = bMps9zGCqIJ2jvDIYK+Iwv0sd+LIHORkqZirTmuqYEw=
SIZE (gstreamer/gst-libav-1.6.0.tar.xz) = 7687504

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-ext_libav_Makefile_in,v 1.1 2015/09/27 08:22:42 ajacoutot Exp $
../../gst-libs/ext/libav/libavutil/libavutil.a(log2_tab.o):(.rodata+0x0): multiple definition of `ff_log2_tab'
--- ext/libav/Makefile.in.orig Sat Sep 26 14:00:02 2015
+++ ext/libav/Makefile.in Sat Sep 26 14:00:19 2015
@@ -464,7 +464,7 @@ libgstlibav_la_LIBADD = $(LIBAV_LIBS) $(GST_PLUGINS_BA
-lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) \
$(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS) $(LZMA_LIBS)
-libgstlibav_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
+libgstlibav_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) -Wl,-z,muldefs
libgstlibav_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
@HAVE_LIBAV_UNINSTALLED_TRUE@libgstlibav_la_DEPENDENCIES = $(LIBAV_DEPS)
noinst_HEADERS = \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gst-libs_ext_libav_configure,v 1.8 2015/05/22 06:40:19 ajacoutot Exp $
--- gst-libs/ext/libav/configure.orig Wed Sep 24 10:55:09 2014
+++ gst-libs/ext/libav/configure Tue Oct 7 17:20:02 2014
@@ -3552,7 +3552,7 @@ die_license_disabled version3 libvo_amrwbenc
$OpenBSD: patch-gst-libs_ext_libav_configure,v 1.9 2015/09/27 08:22:42 ajacoutot Exp $
--- gst-libs/ext/libav/configure.orig Fri Sep 25 23:06:33 2015
+++ gst-libs/ext/libav/configure Sat Sep 26 11:32:31 2015
@@ -4671,7 +4671,7 @@ die_license_disabled version3 libvo_amrwbenc
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-gst-libs_ext_libav_libavcodec_Makefile,v 1.2 2014/10/07 16:06:09 ajacoutot Exp $
libavcodec.a(log2_tab.o)(.rodata+0x0): multiple definition of `ff_log2_tab'
libavformat.a(log2_tab.o)(.rodata+0x0): first defined here
--- gst-libs/ext/libav/libavcodec/Makefile.orig Wed Sep 24 10:55:09 2014
+++ gst-libs/ext/libav/libavcodec/Makefile Tue Oct 7 17:22:20 2014
@@ -18,7 +18,6 @@ OBJS = allcodecs.o
codec_desc.o \
fmtconvert.o \
imgconvert.o \
- log2_tab.o \
mathtables.o \
options.o \
parser.o \

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-gst-libs_ext_libav_libavutil_Makefile,v 1.2 2014/10/07 16:06:09 ajacoutot Exp $
libavutil.a(log2_tab.o)(.rodata+0x0): multiple definition of `ff_log2_tab'
libavformat.a(log2_tab.o)(.rodata+0x0): first defined here
--- gst-libs/ext/libav/libavutil/Makefile.orig Wed Sep 24 10:55:09 2014
+++ gst-libs/ext/libav/libavutil/Makefile Tue Oct 7 17:20:02 2014
@@ -82,7 +82,6 @@ OBJS = adler32.o
lfg.o \
lls.o \
log.o \
- log2_tab.o \
mathematics.o \
md5.o \
mem.o \