Update to gstreamer1-plugins-libav-1.16.0.

This commit is contained in:
ajacoutot 2019-04-21 08:50:45 +00:00
parent d89d564c84
commit bd48ffa6eb
5 changed files with 9 additions and 169 deletions

View File

@ -1,50 +1,17 @@
# $OpenBSD: Makefile,v 1.41 2019/03/05 13:58:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.42 2019/04/21 08:50:45 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
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 iconv intl lzma m orc-0.4 pcre pthread
WANTLIB += z
WANTLIB += avcodec avfilter avformat avutil glib-2.0 gobject-2.0
WANTLIB += gstaudio-1.0 gstbase-1.0 gstpbutils-1.0 gstreamer-1.0
WANTLIB += gstvideo-1.0 intl
MASTER_SITES= ${MASTER_SITE_GST:=gst-libav/}
LIB_DEPENDS= ${P}/plugins-base=${V}
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS += devel/nasm
.endif
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/gst-libs/ext/libav
libav_CONFIGURE_ARGS= --arch=${MACHINE_ARCH} \
--cc=${CC} \
--enable-gpl \
--enable-runtime-cpudetect \
--disable-altivec \
--disable-sdl2 \
--disable-debug
CONFIGURE_ARGS= --with-libav-extra-configure="${libav_CONFIGURE_ARGS}"
MAKE_ENV= V=1
# make sure bundled libav headers are chosen over the system FFmpeg ones
CPPFLAGS += -I${WRKBUILD}/gst-libs/ext/libav
.if ${MACHINE_ARCH} == "i386"
LDFLAGS += -Wl,-znotext
.endif
pre-configure:
sed -i 's,-O3,,g' ${WRKSRC}/gst-libs/ext/libav/configure
LIB_DEPENDS= ${P}/plugins-base=${V} \
graphics/ffmpeg
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (gstreamer/gst-libav-1.14.4.tar.xz) = 39eFkZAd94U+q35WqGw0obA2NdoNPVa4mqV38Yl4Zdo=
SIZE (gstreamer/gst-libav-1.14.4.tar.xz) = 9036732
SHA256 (gstreamer/gst-libav-1.16.0.tar.xz) = 36wRkEOpz9ys16zed/Z0qxcs8lN7WBK+UvSenN3FPZo=
SIZE (gstreamer/gst-libav-1.16.0.tar.xz) = 9461924

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-ext_libav_Makefile_in,v 1.6 2018/09/17 08:46:09 ajacoutot Exp $
../../gst-libs/ext/libav/libavutil/libavutil.a(log2_tab.o):(.rodata+0x0): multiple definition of `ff_log2_tab'
Index: ext/libav/Makefile.in
--- ext/libav/Makefile.in.orig
+++ ext/libav/Makefile.in
@@ -491,7 +491,7 @@ libgstlibav_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) \
$(LIBAV_LIBS) $(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
@HAVE_LIBAV_UNINSTALLED_TRUE@libgstlibav_la_DEPENDENCIES = $(LIBAV_DEPS)
noinst_HEADERS = \
gstav.h \

View File

@ -1,87 +0,0 @@
$OpenBSD: patch-gst-libs_ext_libav_configure,v 1.16 2018/09/17 08:46:09 ajacoutot Exp $
- Remove -fobjc-arc, only makes sense for objc code and not understood by
base-gcc and ports-gcc.
- section_data_rel_ro: required by NEON support
Index: gst-libs/ext/libav/configure
--- gst-libs/ext/libav/configure.orig
+++ gst-libs/ext/libav/configure
@@ -4143,7 +4143,7 @@ probe_cc(){
gcc_extra_ver=$(expr "$($_cc --version 2>/dev/null | head -n1)" : '.*\((.*)\)')
_ident="llvm-gcc $($_cc -dumpversion 2>/dev/null) $gcc_extra_ver"
_depflags='-MMD -MF $(@:.o=.d) -MT $@'
- _cflags_speed='-O3'
+ _cflags_speed=''
_cflags_size='-Os'
elif $_cc -v 2>&1 | grep -qi ^gcc; then
_type=gcc
@@ -4163,13 +4163,13 @@ probe_cc(){
warn "gcc 4.2 is outdated and may miscompile FFmpeg. Please use a newer compiler." ;;
esac
fi
- _cflags_speed='-O3'
+ _cflags_speed=''
_cflags_size='-Os'
elif $_cc --version 2>/dev/null | grep -q ^icc; then
_type=icc
_ident=$($_cc --version | head -n1)
_depflags='-MMD'
- _cflags_speed='-O3'
+ _cflags_speed=''
_cflags_size='-Os'
_cflags_noopt='-O1'
_flags_filter=icc_flags
@@ -4199,7 +4199,7 @@ probe_cc(){
_flags="--arm_linux_config_file=$armcc_conf --translate_gcc"
as_default="${cross_prefix}gcc"
_depflags='-MMD'
- _cflags_speed='-O3'
+ _cflags_speed=''
_cflags_size='-Os'
elif $_cc -version 2>/dev/null | grep -Eq 'TMS470|TI ARM'; then
_type=tms470
@@ -4208,14 +4208,14 @@ probe_cc(){
_cc_e='-ppl -fe=$@'
_cc_o='-fe=$@'
_depflags='-ppa -ppd=$(@:.o=.d)'
- _cflags_speed='-O3 -mf=5'
- _cflags_size='-O3 -mf=2'
+ _cflags_speed=' -mf=5'
+ _cflags_size=' -mf=2'
_flags_filter=tms470_flags
elif $_cc -v 2>&1 | grep -q clang; then
_type=clang
_ident=$($_cc --version 2>/dev/null | head -n1)
_depflags='-MMD -MF $(@:.o=.d) -MT $@'
- _cflags_speed='-O3'
+ _cflags_speed=''
_cflags_size='-Oz'
elif $_cc -V 2>&1 | grep -q Sun; then
_type=suncc
@@ -4244,7 +4244,7 @@ probe_cc(){
_type=pgi
_ident="PGI $($_cc -V 2>&1 | awk '/^pgcc/ { print $2; exit }')"
opt_common='-alias=ansi -Mdse -Mlre -Mpre'
- _cflags_speed="-O3 -Mautoinline -Munroll=c:4 $opt_common"
+ _cflags_speed=" -Mautoinline -Munroll=c:4 $opt_common"
_cflags_size="-O2 -Munroll=c:1 $opt_common"
_cflags_noopt="-O"
_flags_filter=pgi_flags
@@ -4946,6 +4946,7 @@ case $target_os in
;;
openbsd|bitrig)
disable symver
+ enable section_data_rel_ro
SHFLAGS='-shared'
SLIB_INSTALL_NAME='$(SLIBNAME).$(LIBMAJOR).$(LIBMINOR)'
SLIB_INSTALL_LINKS=
@@ -5315,7 +5316,7 @@ EOF
exit 1
fi
-disabled optimizations || enabled ossfuzz || check_cflags -fomit-frame-pointer
+enabled x86_32 && check_cflags -fomit-frame-pointer
enable_weak_pic() {
disabled pic && return

View File

@ -1,26 +1,2 @@
@comment $OpenBSD: PLIST,v 1.4 2016/04/10 10:14:12 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.5 2019/04/21 08:50:45 ajacoutot Exp $
lib/gstreamer-${API}/libgstlibav.so
share/gtk-doc/html/gst-libav-plugins-${API}/
share/gtk-doc/html/gst-libav-plugins-${API}/ch01.html
share/gtk-doc/html/gst-libav-plugins-${API}/ch02.html
share/gtk-doc/html/gst-libav-plugins-${API}/ch03.html
share/gtk-doc/html/gst-libav-plugins-${API}/gst-libav-plugins-${API}.devhelp2
share/gtk-doc/html/gst-libav-plugins-${API}/gst-libav-plugins-GstFFMpegAudDec.html
share/gtk-doc/html/gst-libav-plugins-${API}/gst-libav-plugins-GstFFMpegAudEnc.html
share/gtk-doc/html/gst-libav-plugins-${API}/gst-libav-plugins-GstFFMpegVidDec.html
share/gtk-doc/html/gst-libav-plugins-${API}/gst-libav-plugins-GstFFMpegVidEnc.html
share/gtk-doc/html/gst-libav-plugins-${API}/gst-libav-plugins-gstav.html
share/gtk-doc/html/gst-libav-plugins-${API}/gst-libav-plugins-gstavcfg.html
share/gtk-doc/html/gst-libav-plugins-${API}/gst-libav-plugins-gstavcodecmap.html
share/gtk-doc/html/gst-libav-plugins-${API}/gst-libav-plugins-gstavprotocol.html
share/gtk-doc/html/gst-libav-plugins-${API}/gst-libav-plugins-gstavutils.html
share/gtk-doc/html/gst-libav-plugins-${API}/gst-libav-plugins-plugin-libav.html
share/gtk-doc/html/gst-libav-plugins-${API}/home.png
share/gtk-doc/html/gst-libav-plugins-${API}/index.html
share/gtk-doc/html/gst-libav-plugins-${API}/left-insensitive.png
share/gtk-doc/html/gst-libav-plugins-${API}/left.png
share/gtk-doc/html/gst-libav-plugins-${API}/right-insensitive.png
share/gtk-doc/html/gst-libav-plugins-${API}/right.png
share/gtk-doc/html/gst-libav-plugins-${API}/style.css
share/gtk-doc/html/gst-libav-plugins-${API}/up-insensitive.png
share/gtk-doc/html/gst-libav-plugins-${API}/up.png