On Wed, Nov 23, 2016 at 01:49:41AM +0100, Dmitrij D. Czarkoff wrote:
> Hi!
>
> I was asked off-list to add a "lite" flavor for multimedia/mpv. This
> diff introduces such version. This iteration disables the fllowing in
> "lite" FLAVOR:
>
> * Lua UI and scripting
> * Encoding
> * DVD and BluRay support
> * CDDA
> * Samba support
> * Subtitle reencoding with iconv
> * SDL2-based drivers
> * TV via v4l2
>
> This saves about 38 Mb of dependencies and somewhat reduces the risks.
>
> Comments? OKs?
>
> --
> Dmitrij D. Czarkoff
>
> Index: Makefile
> ===================================================================
> RCS file: /var/cvs/ports/multimedia/mpv/Makefile,v
> retrieving revision 1.34
> diff -u -p -r1.34 Makefile
> --- Makefile 20 Oct 2016 17:28:52 -0000 1.34
> +++ Makefile 22 Nov 2016 19:14:45 -0000
> @@ -8,7 +8,7 @@ COMMENT = movie player based on MPlayer
>
> GH_ACCOUNT = mpv-player
> GH_PROJECT = mpv
> -GH_TAGNAME = v0.21.0
> +GH_TAGNAME = v0.22.0
>
> CATEGORIES = multimedia x11
>
> @@ -25,47 +25,59 @@ EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUF
> PERMIT_PACKAGE_CDROM = patents
> PERMIT_PACKAGE_FTP = Yes
>
> -WANTLIB += EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes
> -WANTLIB += Xinerama Xrandr Xrender Xss Xv Xxf86vm ass avcodec
> -WANTLIB += avdevice avfilter avformat avresample avutil bluray
> -WANTLIB += c cdio cdio_cdda cdio_paranoia drm dvdnav dvdread expat
> -WANTLIB += fontconfig freetype fribidi gbm iconv jpeg lcms2 m opus postproc
> -WANTLIB += pthread pthread-stubs smbclient sndio speex swresample
> -WANTLIB += swscale v4l2 v4lconvert vpx x264 x265 xcb xcb-dri2
> -WANTLIB += xcb-glx z ${MODLUA_WANTLIB}
> +WANTLIB += EGL GL X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes Xinerama
> +WANTLIB += Xrandr Xrender Xss Xv Xxf86vm ass avcodec avfilter
> +WANTLIB += avformat avresample avutil c drm expat fontconfig freetype
> +WANTLIB += fribidi gbm m opus postproc pthread pthread-stubs sndio
> +WANTLIB += speex swresample swscale vpx x264 x265 xcb xcb-dri2
> +WANTLIB += xcb-glx z
>
> -MODULES = lang/lua \
> - lang/python
> +MODULES = lang/python
>
> BUILD_DEPENDS = audio/ladspa \
> - graphics/libmng \
> textproc/py-docutils
>
> -LIB_DEPENDS = audio/libcdio \
> +LIB_DEPENDS = graphics/ffmpeg>=20151112 \
> + multimedia/libass
> +
> +MODPY_RUNDEP = No
> +RUN_DEPENDS = devel/desktop-file-utils \
> + x11/gtk+3,-guic
> +
> +FLAVORS ?= lite
> +FLAVOR ?=
> +
> +.if ${FLAVOR:L:Mlite}
> +TOGGLE = disable
> +.else
> +TOGGLE = enable
Why using a variable for this?
Wouldn't this work?
.if ${FLAVOR:L:Mlite}
CONFIGURE_ARGS += --disable-foo \
--disable-bar
...
> +
> +WANTLIB += SDL2 ass avdevice bluray cdio cdio_cdda cdio_paranoia
> +WANTLIB += dvdnav dvdread expat fontconfig freetype fribidi iconv
> +WANTLIB += jpeg lcms2 smbclient v4l2 v4lconvert ${MODLUA_WANTLIB}
> +
> +MODULES += lang/lua
> +
> +LIB_DEPENDS += audio/libcdio \
> converters/libiconv \
> devel/libdvdread \
> devel/sdl2 \
> - graphics/ffmpeg>=20151112 \
> graphics/jpeg \
> graphics/lcms2 \
> - multimedia/libass \
> multimedia/libbluray>=0.8.0 \
> multimedia/libdvdnav \
> multimedia/libv4l \
> net/samba
> +RUN_DEPENDS += www/youtube-dl
> +.endif
>
> -MODPY_RUNDEP = No
> -RUN_DEPENDS = devel/desktop-file-utils \
> - x11/gtk+3,-guic
>
> CONFIGURE_ARGS = --confloaddir=${SYSCONFDIR}/mpv \
> --confdir=${LOCALBASE}/share/examples/mpv \
> --mandir=${LOCALBASE}/man \
> --docdir=${LOCALBASE}/share/examples/mpv \
> --zshdir=${LOCALBASE}/share/zsh/vendor-completions \
> - --enable-encoding \
> --enable-sndio \
> - --enable-sdl2 \
> --enable-zsh-comp \
> --disable-alsa \
> --disable-caca \
> @@ -92,7 +104,22 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONF
> --disable-vdpau-hwaccel \
> --disable-videotoolbox-hwaccel \
> --disable-videotoolbox-gl \
> - --disable-wayland
> + --disable-wayland \
> + --${TOGGLE}-audio-input \
> + --${TOGGLE}-cdda \
> + --${TOGGLE}-dvdread \
> + --${TOGGLE}-dvdnav \
> + --${TOGGLE}-encoding \
> + --${TOGGLE}-iconv \
> + --${TOGGLE}-jpeg \
> + --${TOGGLE}-lcms2 \
> + --${TOGGLE}-libavdevice \
> + --${TOGGLE}-libbluray \
> + --${TOGGLE}-libsmbclient \
> + --${TOGGLE}-libv4l2 \
> + --${TOGGLE}-lua \
> + --${TOGGLE}-sdl2 \
> + --${TOGGLE}-tv
>
> MAKE_ENV += LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
> MAKE_ENV += CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
> Index: distinfo
> ===================================================================
> RCS file: /var/cvs/ports/multimedia/mpv/distinfo,v
> retrieving revision 1.18
> diff -u -p -r1.18 distinfo
> --- distinfo 20 Oct 2016 17:28:52 -0000 1.18
> +++ distinfo 22 Nov 2016 16:45:58 -0000
> @@ -1,4 +1,4 @@
> -SHA256 (mpv-0.21.0.tar.gz) = 0F+OzoWcUA7xZJzf6pEewVKd8YmLj9o+IXdm3Cjcm9M=
> +SHA256 (mpv-0.22.0.tar.gz) = wPmsjw43o5HRkAezM++Hh8L0XXWg1EAcAJjN5SxQgvY=
> SHA256 (waf-1.8.19) = LtVHGgjfJY+FV4dXYarWfoCy3IRkgtwRE1o1x3yRtLM=
> -SIZE (mpv-0.21.0.tar.gz) = 2812584
> +SIZE (mpv-0.22.0.tar.gz) = 2822645
> SIZE (waf-1.8.19) = 100743
> Index: patches/patch-video_out_opengl_context_c
> ===================================================================
> RCS file: patches/patch-video_out_opengl_context_c
> diff -N patches/patch-video_out_opengl_context_c
> --- patches/patch-video_out_opengl_context_c 20 Oct 2016 17:28:52 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-video_out_opengl_context_c,v 1.1 2016/10/20 17:28:52
> czarkoff Exp $
> ---- video/out/opengl/context.c.orig Wed Oct 19 23:10:13 2016
> -+++ video/out/opengl/context.c Thu Oct 20 18:21:42 2016
> -@@ -125,7 +125,7 @@ int mpgl_validate_backend_opt(struct mp_log *log, cons
> -
> - #if HAVE_C11_TLS
> - #define MP_TLS _Thread_local
> --#elif defined(__GNUC__)
> -+#elif HAVE_GCC_TLS
> - #define MP_TLS __thread
> - #endif
> -
> Index: patches/patch-wscript
> ===================================================================
> RCS file: patches/patch-wscript
> diff -N patches/patch-wscript
> --- patches/patch-wscript 20 Oct 2016 17:28:52 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-wscript,v 1.1 2016/10/20 17:28:52 czarkoff Exp $
> ---- wscript.orig Wed Oct 19 23:10:13 2016
> -+++ wscript Thu Oct 20 18:21:42 2016
> -@@ -186,6 +186,10 @@ main_dependencies = [
> - 'desc': 'C11 TLS support',
> - 'func': check_statement('stddef.h', 'static _Thread_local int x =
> 0'),
> - }, {
> -+ 'name': 'gcc-tls',
> -+ 'desc': 'GCC TLS support',
> -+ 'func': check_statement('stddef.h', 'static __thread int x = 0'),
> -+ }, {
> - 'name': 'librt',
> - 'desc': 'linking with -lrt',
> - 'deps': [ 'pthreads' ],
> Index: pkg/PFRAG.no-lite
> ===================================================================
> RCS file: pkg/PFRAG.no-lite
> diff -N pkg/PFRAG.no-lite
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/PFRAG.no-lite 22 Nov 2016 16:45:58 -0000
> @@ -0,0 +1,2 @@
> +@comment $OpenBSD$
> +share/examples/mpv/encoding-profiles.conf
> Index: pkg/PLIST
> ===================================================================
> RCS file: /var/cvs/ports/multimedia/mpv/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 4 May 2016 09:13:10 -0000 1.4
> +++ pkg/PLIST 22 Nov 2016 16:45:58 -0000
> @@ -1,9 +1,9 @@
> @comment $OpenBSD: PLIST,v 1.4 2016/05/04 09:13:10 czarkoff Exp $
> +!%%lite%%
> @bin bin/mpv
> @man man/man1/mpv.1
> share/applications/mpv.desktop
> share/examples/mpv/
> -share/examples/mpv/encoding-profiles.conf
> share/examples/mpv/input.conf
> share/examples/mpv/mplayer-input.conf
> share/examples/mpv/mpv.conf
>
--
Antoine
