Do we need to sub package? Can't we include everything in main?
Anyway the change from libv4l to libv4l,-main is not needed as it's the default.
—
Antoine
> On 14 Dec 2021, at 13:50, Klemens Nanni <kn@openbsd.org> wrote:
>
> Video4Linux headers are required for an ongoing porting effort;
> FreeBSD has a dedicated port for this that reaches back to their libv4l
> port it seems, which looks practically identical to our MULTI_PACKAGES.
>
> I just package the headers that are needed in their own subpackage.
> The actual libv4l package remains unchanged except that its FULLPKGPATH
> now has "-main", hence bumping all consumers.
>
> Feedback? OK?
>
> Index: x11/vlc/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/vlc/Makefile,v
> retrieving revision 1.252
> diff -u -p -r1.252 Makefile
> --- x11/vlc/Makefile 3 Sep 2021 11:47:42 -0000 1.252
> +++ x11/vlc/Makefile 14 Dec 2021 12:20:13 -0000
> @@ -7,7 +7,7 @@ V= 3.0.14
> DISTNAME= vlc-${V}
> PKGNAME-main= ${DISTNAME}
> PKGNAME-jack= vlc-jack-${V}
> -REVISION-main= 1
> +REVISION-main= 2
> REVISION-jack= 0
> CATEGORIES= x11
> MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${V}/
> @@ -90,7 +90,7 @@ LIB_DEPENDS-main= ${MODQT5_LIB_DEPENDS}
> multimedia/libbluray \
> multimedia/libdvdnav \
> multimedia/libmatroska \
> - multimedia/libv4l \
> + multimedia/libv4l,-main \
> multimedia/x264 \
> multimedia/x265 \
> net/avahi,-libs \
> Index: telephony/linphone/mediastreamer2/Makefile
> ===================================================================
> RCS file: /cvs/ports/telephony/linphone/mediastreamer2/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- telephony/linphone/mediastreamer2/Makefile 26 Jul 2021 07:08:32 -0000 1.6
> +++ telephony/linphone/mediastreamer2/Makefile 14 Dec 2021 12:20:13 -0000
> @@ -3,7 +3,7 @@
> COMMENT = streaming engine for voice/video telephony applications
>
> MODULE = mediastreamer2
> -REVISION = 1
> +REVISION = 2
>
> SHARED_LIBS += mediastreamer 0.0 # 11
>
> @@ -26,7 +26,7 @@ LIB_DEPENDS = telephony/linphone/bctoolb
> telephony/linphone/ortp \
> telephony/linphone/bzrtp \
> telephony/bcg729 \
> - multimedia/libv4l \
> + multimedia/libv4l,-main \
> multimedia/libvpx \
> multimedia/libtheora \
> security/libsrtp>=2.3.0p2 \
> Index: telephony/baresip/baresip/Makefile
> ===================================================================
> RCS file: /cvs/ports/telephony/baresip/baresip/Makefile,v
> retrieving revision 1.29
> diff -u -p -r1.29 Makefile
> --- telephony/baresip/baresip/Makefile 20 Jun 2021 12:13:52 -0000 1.29
> +++ telephony/baresip/baresip/Makefile 14 Dec 2021 12:20:13 -0000
> @@ -6,6 +6,7 @@ COMMENT-gtk = GTK+-based modules for ba
> GH_ACCOUNT = baresip
> GH_PROJECT = baresip
> GH_TAGNAME = v1.1.0
> +REVISION-main = 0
> REVISION-gtk = 0
> PKGNAME-main = baresip-${GH_TAGNAME:C/^v//}
> PKGNAME-gtk = baresip-gtk-${GH_TAGNAME:C/^v//}
> @@ -28,7 +29,7 @@ LIB_DEPENDS-main = audio/gsm \
> audio/twolame \
> graphics/ffmpeg \
> graphics/png \
> - multimedia/libv4l \
> + multimedia/libv4l,-main \
> multimedia/libvpx>=1.3.0 \
> net/mosquitto \
> telephony/baresip/re>=2.0.1 \
> Index: net/utox/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/utox/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- net/utox/Makefile 14 Oct 2021 16:52:03 -0000 1.11
> +++ net/utox/Makefile 14 Dec 2021 12:20:13 -0000
> @@ -8,6 +8,7 @@ DISTNAME = uTox-${V}-full
> PKGNAME = utox-${V}
> MASTER_SITES = https://github.com/uTox/uTox/releases/download/v${V}/
> FIX_EXTRACT_PERMISSIONS = Yes
> +REVISION = 0
>
> CATEGORIES = net
>
> @@ -25,7 +26,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
> x11/gtk+3,-guic
>
> LIB_DEPENDS += audio/openal \
> - multimedia/libv4l \
> + multimedia/libv4l,-main \
> x11/dbus \
> net/toxcore
>
> Index: multimedia/xine-lib/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v
> retrieving revision 1.148
> diff -u -p -r1.148 Makefile
> --- multimedia/xine-lib/Makefile 8 Jul 2021 10:43:26 -0000 1.148
> +++ multimedia/xine-lib/Makefile 14 Dec 2021 12:20:13 -0000
> @@ -3,7 +3,7 @@
> COMMENT= multimedia decoding library
>
> DISTNAME= xine-lib-1.2.11
> -REVISION= 0
> +REVISION= 1
> CATEGORIES= multimedia
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
> EXTRACT_SUFX= .tar.xz
> @@ -55,7 +55,7 @@ LIB_DEPENDS= audio/flac \
> multimedia/libbluray>=0.8.0 \
> multimedia/libdvdnav \
> multimedia/libtheora \
> - multimedia/libv4l \
> + multimedia/libv4l,-main \
> x11/libxdg-basedir
>
> # Add back fast math flag since we override CFLAGS
> Index: multimedia/gstreamer1/plugins-good/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer1/plugins-good/Makefile,v
> retrieving revision 1.73
> diff -u -p -r1.73 Makefile
> --- multimedia/gstreamer1/plugins-good/Makefile 9 Sep 2021 10:12:20 -0000 1.73
> +++ multimedia/gstreamer1/plugins-good/Makefile 14 Dec 2021 12:20:13 -0000
> @@ -11,6 +11,7 @@ DISTNAME= gst-plugins-good-${V}
> PKGNAME= ${GST_PKGNAME_PREFIX}-plugins-good-${V}
>
> PKGNAME-main= ${PKGNAME}
> +REVISION-main= 0
> PKGNAME-pulse= ${GST_PKGNAME_PREFIX}-plugins-pulse-${V}
>
> MASTER_SITES= ${MASTER_SITE_GST:=gst-plugins-good/}
> @@ -46,7 +47,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
> audio/twolame \
> audio/wavpack \
> devel/libsoup \
> - multimedia/libv4l \
> + multimedia/libv4l,-main \
> multimedia/libvpx \
> net/libshout \
> x11/gtk+3
> Index: graphics/sane-backends/Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/sane-backends/Makefile,v
> retrieving revision 1.103
> diff -u -p -r1.103 Makefile
> --- graphics/sane-backends/Makefile 3 Sep 2021 11:48:53 -0000 1.103
> +++ graphics/sane-backends/Makefile 14 Dec 2021 12:20:13 -0000
> @@ -5,7 +5,7 @@ BROKEN-alpha= ICE hp5590.c:1141: error:
> COMMENT= API for accessing scanners, backends
>
> DISTNAME= sane-backends-1.0.32
> -REVISION= 2
> +REVISION= 3
>
> SHARED_LIBS += sane 2.1 # unknown
>
> @@ -34,7 +34,7 @@ BUILD_DEPENDS= devel/gettext,-tools
> LIB_DEPENDS= devel/libusb1 \
> graphics/png \
> graphics/tiff \
> - multimedia/libv4l \
> + multimedia/libv4l,-main \
> textproc/libxml
>
> FLAVORS= escl snmp
> Index: graphics/ffmpeg/Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
> retrieving revision 1.216
> diff -u -p -r1.216 Makefile
> --- graphics/ffmpeg/Makefile 20 Nov 2021 14:34:35 -0000 1.216
> +++ graphics/ffmpeg/Makefile 14 Dec 2021 12:20:13 -0000
> @@ -4,7 +4,7 @@ COMMENT= audio/video converter and strea
>
> V= 4.4.1
> DISTNAME= ffmpeg-${V}
> -REVISION= 0
> +REVISION= 1
> EPOCH= 1
> CATEGORIES= graphics multimedia
> MASTER_SITES= https://ffmpeg.org/releases/
> @@ -55,7 +55,7 @@ LIB_DEPENDS= archivers/bzip2 \
> multimedia/dav1d \
> multimedia/libass \
> multimedia/libtheora \
> - multimedia/libv4l \
> + multimedia/libv4l,-main \
> multimedia/libvidstab \
> multimedia/libvpx \
> multimedia/x264 \
> Index: ./multimedia/libv4l/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/libv4l/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- ./multimedia/libv4l/Makefile 9 Jun 2021 19:50:09 -0000 1.26
> +++ ./multimedia/libv4l/Makefile 12 Dec 2021 18:28:10 -0000
> @@ -1,11 +1,17 @@
> # $OpenBSD: Makefile,v 1.26 2021/06/09 19:50:09 sthen Exp $
>
> -COMMENT = libv4l userspace library
> +COMMENT-main = libv4l userspace library
> +COMMENT-compat = V4L ioctl header files
>
> VERSION = 1.20.0
> DISTNAME = v4l-utils-${VERSION}
> -PKGNAME = libv4l-${VERSION}
> -REVISION = 0
> +PKGNAME-main = libv4l-${VERSION}
> +PKGNAME-compat = v4l-compat-${VERSION}
> +REVISION-main = 1
> +
> +PKG_ARCH-compat = *
> +
> +MULTI_PACKAGES = -main -compat
>
> SHARED_LIBS += v4l1 0.0 # 0.0
> SHARED_LIBS += v4l2 0.0 # 0.0
> @@ -21,14 +27,14 @@ MAINTAINER = Ingo Feinerer <feinerer@lo
> # LGPLv2+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += c execinfo jpeg m pthread
> +WANTLIB-main += c execinfo jpeg m pthread
>
> MASTER_SITES = https://linuxtv.org/downloads/v4l-utils/
>
> EXTRACT_SUFX = .tar.bz2
>
> BUILD_DEPENDS = devel/argp-standalone
> -LIB_DEPENDS = graphics/jpeg>=1.5.0v0
> +LIB_DEPENDS-main = graphics/jpeg>=1.5.0v0
>
> SEPARATE_BUILD = Yes
> LIBTOOL_FLAGS = --tag=disable-static
> @@ -39,5 +45,8 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE
> LDFLAGS="-L${LOCALBASE}/lib"
>
> AUTOCONF_VERSION = 2.69
> +
> +post-install:
> + cd ${WRKSRC}/contrib/freebsd && pax -rw include ${PREFIX}/
>
> .include <bsd.port.mk>
> Index: ./multimedia/libv4l/patches/patch-contrib_freebsd_include_linux_input_h
> ===================================================================
> RCS file: ./multimedia/libv4l/patches/patch-contrib_freebsd_include_linux_input_h
> diff -N ./multimedia/libv4l/patches/patch-contrib_freebsd_include_linux_input_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ ./multimedia/libv4l/patches/patch-contrib_freebsd_include_linux_input_h 12 Dec 2021 17:01:00 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Treat OpenBSD like FreeBSD.
> +
> +Index: contrib/freebsd/include/linux/input.h
> +--- contrib/freebsd/include/linux/input.h.orig
> ++++ contrib/freebsd/include/linux/input.h
> +@@ -43,7 +43,7 @@ typedef int8_t __s8;
> +
No comments:
Post a Comment