On Tue, May 16, 2023 at 01:30:47PM +0100, Stuart Henderson wrote:
> On 2023/05/16 12:25, Antoine Jacoutot wrote:
> > You need a @pkgpath marker to allow smooth upgrade from flavored to
> > unflavored.
>
> I committed transcode which doesn't have that problem.
>
> For mjpegtools I propose this lazy diff. It doesn't handle merging
> FLAVOR="quicktime optimized". Handling that is possible, but then we
> need a PFRAG.optimized and it's fairly pointless as we aren't packaging
> the "optimized" flavour at all anyway (either with quicktime, or on
> its own) so it makes no difference for binary package users.
OK
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/Makefile,v
> retrieving revision 1.152
> diff -u -p -r1.152 Makefile
> --- Makefile 16 Mar 2023 06:42:21 -0000 1.152
> +++ Makefile 16 May 2023 12:27:22 -0000
> @@ -45,7 +45,7 @@
> SUBDIR += mediainfo
> SUBDIR += minidlna
> SUBDIR += mjpegtools
> - SUBDIR += mjpegtools,quicktime
> + SUBDIR += mjpegtools
> SUBDIR += mkvtoolnix
> SUBDIR += mlt7
> SUBDIR += motion
> Index: mjpegtools/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/mjpegtools/Makefile,v
> retrieving revision 1.52
> diff -u -p -r1.52 Makefile
> --- mjpegtools/Makefile 5 Nov 2022 17:06:29 -0000 1.52
> +++ mjpegtools/Makefile 16 May 2023 12:27:22 -0000
> @@ -1,7 +1,7 @@
> COMMENT= tools to edit/modify/encode video streams
>
> DISTNAME= mjpegtools-2.0.0
> -REVISION= 12
> +REVISION= 13
> CATEGORIES= multimedia
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mjpeg/}
>
> @@ -21,7 +21,7 @@ WANTLIB += SDL SDL_gfx X11 Xcomposite Xc
> WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo dv expat
> WANTLIB += ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
> WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
> -WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl jpeg m pango-1.0
> +WANTLIB += gtk-x11-2.0 harfbuzz iconv intl jpeg m pango-1.0
> WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png pthread
> WANTLIB += sndio usbhid xcb xcb-render xcb-shm z fribidi Xau Xdmcp
> WANTLIB += ${COMPILER_LIBCXX}
> @@ -38,22 +38,16 @@ LIB_DEPENDS= devel/sdl \
> CONFIGURE_STYLE= autoconf
> AUTOCONF_VERSION= 2.68
> CONFIGURE_ARGS+= --with-x \
> + --without-libquicktime \
> --without-v4l
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
>
> -FLAVORS= quicktime optimized
> +FLAVORS= optimized
> FLAVOR?=
>
> .if !${FLAVOR:Moptimized}
> CONFIGURE_ARGS+= --disable-simd-accel
> -.endif
> -
> -.if ${FLAVOR:Mquicktime}
> -LIB_DEPENDS += multimedia/libquicktime
> -WANTLIB+= quicktime>=2
> -.else
> -CONFIGURE_ARGS += --without-libquicktime
> .endif
>
> .include <bsd.port.mk>
> Index: mjpegtools/pkg/DESCR
> ===================================================================
> RCS file: /cvs/ports/multimedia/mjpegtools/pkg/DESCR,v
> retrieving revision 1.4
> diff -u -p -r1.4 DESCR
> --- mjpegtools/pkg/DESCR 20 Jun 2012 08:45:37 -0000 1.4
> +++ mjpegtools/pkg/DESCR 16 May 2023 12:27:22 -0000
> @@ -3,9 +3,6 @@ filtering and encoding video under UNIX-
>
> Flavors:
>
> - quicktime - Builds the package with support for reading and writing
> - QuickTime ".MOV" files.
> -
> optimized - Builds the package with SSE instructions. Packages built
> with this FLAVOR might not run on systems that are not SSE
> capable.
> Index: mjpegtools/pkg/PFRAG.quicktime
> ===================================================================
> RCS file: mjpegtools/pkg/PFRAG.quicktime
> diff -N mjpegtools/pkg/PFRAG.quicktime
> --- mjpegtools/pkg/PFRAG.quicktime 11 Mar 2022 19:39:23 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -@bin bin/qttoy4m
> -@bin bin/y4mtoqt
> Index: mjpegtools/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/multimedia/mjpegtools/pkg/PLIST,v
> retrieving revision 1.10
> diff -u -p -r1.10 PLIST
> --- mjpegtools/pkg/PLIST 11 Mar 2022 19:39:23 -0000 1.10
> +++ mjpegtools/pkg/PLIST 16 May 2023 12:27:22 -0000
> @@ -1,5 +1,5 @@
> +@pkgpath multimedia/mjpegtools,quicktime
> @conflict mplex-*
> -%%quicktime%%
> bin/anytovcd.sh
> @bin bin/glav
> @bin bin/jpeg2yuv
>
--
Antoine
