cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to mpv 0.14.0

Browse Source 
Original patch from brad@

OK feinerer@, sthen@
This commit is contained in:
czarkoff 2016-01-12 09:09:57 +00:00
parent 27ce2ffe42
commit edae0d4458
5 changed files with 55 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
multimedia/mpv/Makefile
View File

@ -1,17 +1,13 @@
# $OpenBSD: Makefile,v 1.21 2016/01/08 18:47:01 feinerer Exp $
# $OpenBSD: Makefile,v 1.22 2016/01/12 09:09:57 czarkoff Exp $
# archs with atomic ops
ONLY_FOR_ARCHS = alpha amd64 i386 mips64 mips64el powerpc sparc64
COMMENT = movie player based on MPlayer/mplayer2
V = 0.13.0
DISTNAME = mpv-${V}
REVISION = 0
GH_ACCOUNT= mpv-player
GH_PROJECT= mpv
GH_TAGNAME= v${V}
GH_TAGNAME= v0.14.0
CATEGORIES = multimedia x11
@ -23,10 +19,10 @@ MAINTAINER = Dmitrij D. Czarkoff <czarkoff@openbsd.org>
PERMIT_PACKAGE_CDROM = patents
PERMIT_PACKAGE_FTP = Yes
WANTLIB += EGL GL X11 Xext Xinerama Xrandr Xss Xv ass avcodec
WANTLIB += EGL GL SDL2 X11 Xext Xinerama Xrandr Xss Xv ass avcodec
WANTLIB += avdevice avfilter avformat avutil bluray c cdio cdio_cdda
WANTLIB += cdio_paranoia dvdnav dvdread jpeg lcms2 m pthread
WANTLIB += smbclient sndio swresample swscale v4l2 z ${MODLUA_WANTLIB}
WANTLIB += cdio_paranoia dvdnav dvdread jpeg lcms2 m pthread smbclient
WANTLIB += sndio swresample swscale v4l2 z ${MODLUA_WANTLIB}
MODULES = converters/libiconv \
lang/lua \
@ -38,6 +34,7 @@ BUILD_DEPENDS = audio/ladspa \
LIB_DEPENDS = audio/libcdio \
devel/libdvdread \
devel/sdl2 \
graphics/ffmpeg>=20151112 \
graphics/jpeg \
graphics/lcms2 \
@ -54,13 +51,15 @@ PORTPATH = \
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
CFLAGS += -I. -I.. -I${LOCALBASE}/include `pkg-config --cflags smbclient`
CFLAGS += -I. -I.. -I${LOCALBASE}/include
CONFIGURE_STYLE = simple
CONFIGURE_SCRIPT = TOOLS/old-configure
CONFIGURE_ARGS += --confdir=${SYSCONFDIR}/mpv \
--mandir=${LOCALBASE}/man \
--extra-ldflags="-L${LOCALBASE}/lib" \
--extra-ldflags="`pkg-config --libs sdl2`" \
--extra-cflags="`pkg-config --cflags sdl2`" \
--enable-sdl2 \
--disable-alsa \
--disable-caca \
--disable-enca \
@ -75,10 +74,6 @@ CONFIGURE_ARGS += --confdir=${SYSCONFDIR}/mpv \
--disable-uchardet
CONFIGURE_ENV += TMPDIR=${WRKBUILD}
# pkg-config says smbclient's version is 0
CONFIGURE_ARGS += --enable-smb \
--extra-libs="-lsmbclient"
USE_GMAKE = Yes
MAKE_FLAGS = V=1
FAKE_FLAGS = CONFDIR=${DESTDIR}${PREFIX}/share/examples/mpv

4
multimedia/mpv/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mpv-0.13.0.tar.gz) = E3JwT9j1cB731g80f9Ff5TbiPvFIJ5v0pEFecolpEts=
SIZE (mpv-0.13.0.tar.gz) = 2874190
SHA256 (mpv-0.14.0.tar.gz) = BCk39INgPww9HewR6PAEXown8Z7uRupk2Bo83wHlEjM=
SIZE (mpv-0.14.0.tar.gz) = 2872619

8
multimedia/mpv/patches/patch-DOCS_man_options_rst
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-DOCS_man_options_rst,v 1.5 2015/11/22 18:33:04 czarkoff Exp $
--- DOCS/man/options.rst.orig Tue Nov 10 13:14:14 2015
+++ DOCS/man/options.rst Sun Nov 15 17:43:54 2015
@@ -2020,10 +2020,10 @@ Disc Devices
$OpenBSD: patch-DOCS_man_options_rst,v 1.6 2016/01/12 09:09:57 czarkoff Exp $
--- DOCS/man/options.rst.orig Fri Dec 11 13:20:29 2015
+++ DOCS/man/options.rst Tue Dec 15 00:16:05 2015
@@ -2044,10 +2044,10 @@ Disc Devices
------------
``--cdrom-device=<path>``

43
multimedia/mpv/patches/patch-TOOLS_old-configure
View File

@ -1,21 +1,45 @@
$OpenBSD: patch-TOOLS_old-configure,v 1.4 2016/01/08 18:47:01 feinerer Exp $
$OpenBSD: patch-TOOLS_old-configure,v 1.5 2016/01/12 09:09:57 czarkoff Exp $
- Adjust for BSD fstatfs
- Disable the use of SSE4 intrinsics
- Disable the use of C11
- Disable extra compiler flags
--- TOOLS/old-configure.orig Tue Nov 10 19:14:14 2015
+++ TOOLS/old-configure Mon Nov 23 17:41:01 2015
@@ -829,7 +829,7 @@ check_pkg_config "libavdevice" $_libavdevice LIBAVDEVI
--- TOOLS/old-configure.orig Fri Dec 11 19:20:29 2015
+++ TOOLS/old-configure Sat Jan 9 20:35:38 2016
@@ -379,16 +379,8 @@ cflag_check -pipe -I. && _pipe="-pipe" && echores "yes
addcflags() { cflag_check "$@" && OURCFLAGS="$OURCFLAGS $@" ; }
-OURCFLAGS="-std=c99 -Wall $_opt"
+OURCFLAGS="-std=c99 $_opt"
-addcflags -g -g3 -ggdb
-addcflags -Wundef -Wmissing-prototypes -Wshadow -Wno-switch -Wparentheses -Wpointer-arith -Wno-redundant-decls -Wno-pointer-sign -Werror=implicit-function-declaration -Wno-error=deprecated-declarations -Wno-error=unused-function
-# clang
-addcflags -Wno-logical-op-parentheses -fcolor-diagnostics -Wno-tautological-compare -Wno-tautological-constant-out-of-range-compare
-# extra
-addcflags -Wno-format-zero-length -Wempty-body -Wdisabled-optimization -Wstrict-prototypes
-
-cflag_check -MD -MP && DEPFLAGS="-MD -MP"
cflag_check -lm && _ld_lm="-lm"
extra_ldflags="$extra_ldflags $LDFLAGS"
@@ -827,8 +819,12 @@ check_pkg_config "libavdevice" $_libavdevice LIBAVDEVI
check_trivial "TV interface" $_tv TV
+_v4l2_header=linux/videodev2.h
+if test $(uname -s) = OpenBSD ; then
+ _v4l2_header=sys/videoio.h
+fi
check_statement_libs "Video 4 Linux 2 TV interface" $_tv_v4l2 TV_V4L2 \
- "sys/time.h linux/videodev2.h"
+ "sys/time.h sys/videoio.h"
+ "sys/time.h ${_v4l2_header}"
_tv_v4l2=$(defretval)
check_trivial "TV audio input" $_tv_v4l2 AUDIO_INPUT
@@ -942,8 +942,8 @@ cat > $TMPC << EOF
@@ -938,8 +934,8 @@ cat > $TMPC << EOF
/* we didn't bother to add actual config checks for this, or they are
for platforms not supported by this configure script */
@ -26,7 +50,7 @@ $OpenBSD: patch-TOOLS_old-configure,v 1.4 2016/01/08 18:47:01 feinerer Exp $
#define HAVE_GL_COCOA 0
#define HAVE_COCOA 0
#define HAVE_COCOA_APPLICATION 0
@@ -973,8 +973,8 @@ cat > $TMPC << EOF
@@ -969,10 +965,10 @@ cat > $TMPC << EOF
#define HAVE_EGL_DRM 0
#define HAVE_VIDEOTOOLBOX_HWACCEL 0
#define HAVE_VIDEOTOOLBOX_GL 0
@ -34,6 +58,9 @@ $OpenBSD: patch-TOOLS_old-configure,v 1.4 2016/01/08 18:47:01 feinerer Exp $
-#define HAVE_C11_TLS 1
+#define HAVE_SSE4_INTRINSICS 0
+#define HAVE_C11_TLS 0
#define HAVE_EGL_ANGLE 0
-#define HAVE_GPL3 1
+#define HAVE_GPL3 0
#define HAVE_WIN32 0
#ifdef __OpenBSD__
#define DEFAULT_CDROM_DEVICE "/dev/rcd0c"

8
multimedia/mpv/patches/patch-TOOLS_old-makefile
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-TOOLS_old-makefile,v 1.1 2015/11/22 18:33:04 czarkoff Exp $
$OpenBSD: patch-TOOLS_old-makefile,v 1.2 2016/01/12 09:09:57 czarkoff Exp $
Disable the use of SSE4 intrinsics
--- TOOLS/old-makefile.orig Tue Nov 10 13:14:14 2015
+++ TOOLS/old-makefile Sun Nov 15 17:43:54 2015
@@ -237,7 +237,6 @@ SOURCES = audio/audio.c \
--- TOOLS/old-makefile.orig Fri Dec 11 13:20:29 2015
+++ TOOLS/old-makefile Tue Dec 15 00:20:33 2015
@@ -233,7 +233,6 @@ SOURCES = audio/audio.c \
ta/ta_talloc.c \
video/csputils.c \
video/fmt-conversion.c \