commit fa2855b933e113288b33e20ad8e45684562389d2 Author: Danny Rawlins <contact@romster.me> Date: Tue Dec 28 00:37:05 2021 +1100 [notify] gst-plugins-bad: added patch for neon changed a bunch of dependencies, notably added vulkan support diff --git a/gst-plugins-bad/.footprint b/gst-plugins-bad/.footprint index 83a7ed04a..1c3746974 100644 --- a/gst-plugins-bad/.footprint +++ b/gst-plugins-bad/.footprint @@ -69,6 +69,42 @@ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/uridownloader/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/uridownloader/gsturidownloader.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/uridownloader/gsturidownloader_debug.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/uridownloader/uridownloader-prelude.h +drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/vulkan/ +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkapi.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkbarrier.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkbuffermemory.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkbufferpool.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkcommandbuffer.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkcommandpool.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkconfig.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkdebug.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkdescriptorcache.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkdescriptorpool.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkdescriptorset.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkdevice.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkdisplay.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkerror.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkfence.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkformat.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkfullscreenquad.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkhandle.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkhandlepool.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkimagebufferpool.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkimagememory.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkimageview.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkinstance.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkmemory.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkphysicaldevice.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkqueue.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkswapper.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvktrash.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkutils.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkvideofilter.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/gstvkwindow.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/vulkan-enumtypes.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/vulkan-prelude.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/vulkan.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/vulkan/vulkan_fwd.h drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/webrtc/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/webrtc/datachannel.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/webrtc/dtlstransport.h @@ -88,6 +124,7 @@ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/GstMpegts-1.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/GstPlayer-1.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/GstTranscoder-1.0.typelib +-rw-r--r-- root/root usr/lib/girepository-1.0/GstVulkan-1.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/GstWebRTC-1.0.typelib drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstaccurip.so @@ -103,6 +140,7 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstaudiovisualizers.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstautoconvert.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstbayer.so +-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstbluez.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstbz2.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstcamerabin.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstchromaprint.so @@ -114,7 +152,6 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstdebugutilsbad.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstdecklink.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstdtls.so --rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstdtsdec.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstdvb.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstdvbsubenc.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstdvbsuboverlay.so @@ -123,6 +160,7 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstfaad.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstfaceoverlay.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstfbdevsink.so +-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstfdkaac.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstfestival.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstfieldanalysis.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstfreeverb.so @@ -142,8 +180,8 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstkms.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstladspa.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstlegacyrawparse.so +-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstlv2.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstmidi.so --rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstmms.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstmodplug.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstmpeg2enc.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstmpegpsdemux.so @@ -156,15 +194,14 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstnetsim.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstnvcodec.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstopenal.so +-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstopenjpeg.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstopusparse.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstpcapparse.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstpnm.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstproxy.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstremovesilence.so --rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstresindvd.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstrfbsrc.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstrist.so --rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstrsvg.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstrtmp.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstrtmp2.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstrtpmanagerbad.so @@ -177,6 +214,7 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstsmooth.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstsmoothstreaming.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstsndfile.so +-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstsoundtouch.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstspeed.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstsrtp.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstsubenc.so @@ -192,7 +230,9 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstvideoparsersbad.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstvideosignal.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstvmnc.so +-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstvulkan.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstwebp.so +-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstwebrtc.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstx265.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgsty4mdec.so lrwxrwxrwx root/root usr/lib/libgstadaptivedemux-1.0.so -> libgstadaptivedemux-1.0.so.0 @@ -233,6 +273,9 @@ lrwxrwxrwx root/root usr/lib/libgsttranscoder-1.0.so -> libgsttranscoder-1.0.so. lrwxrwxrwx root/root usr/lib/libgsturidownloader-1.0.so -> libgsturidownloader-1.0.so.0 lrwxrwxrwx root/root usr/lib/libgsturidownloader-1.0.so.0 -> libgsturidownloader-1.0.so.0.1805.0 -rwxr-xr-x root/root usr/lib/libgsturidownloader-1.0.so.0.1805.0 +lrwxrwxrwx root/root usr/lib/libgstvulkan-1.0.so -> libgstvulkan-1.0.so.0 +lrwxrwxrwx root/root usr/lib/libgstvulkan-1.0.so.0 -> libgstvulkan-1.0.so.0.1805.0 +-rwxr-xr-x root/root usr/lib/libgstvulkan-1.0.so.0.1805.0 lrwxrwxrwx root/root usr/lib/libgstwebrtc-1.0.so -> libgstwebrtc-1.0.so.0 lrwxrwxrwx root/root usr/lib/libgstwebrtc-1.0.so.0 -> libgstwebrtc-1.0.so.0.1805.0 -rwxr-xr-x root/root usr/lib/libgstwebrtc-1.0.so.0.1805.0 @@ -246,6 +289,7 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-plugins-bad-1.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-sctp-1.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-transcoder-1.0.pc +-rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-vulkan-1.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-webrtc-1.0.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/gir-1.0/ @@ -255,6 +299,7 @@ drwxr-xr-x root/root usr/share/gir-1.0/ -rw-r--r-- root/root usr/share/gir-1.0/GstMpegts-1.0.gir -rw-r--r-- root/root usr/share/gir-1.0/GstPlayer-1.0.gir -rw-r--r-- root/root usr/share/gir-1.0/GstTranscoder-1.0.gir +-rw-r--r-- root/root usr/share/gir-1.0/GstVulkan-1.0.gir -rw-r--r-- root/root usr/share/gir-1.0/GstWebRTC-1.0.gir drwxr-xr-x root/root usr/share/gstreamer-1.0/ drwxr-xr-x root/root usr/share/gstreamer-1.0/encoding-profiles/ diff --git a/gst-plugins-bad/.signature b/gst-plugins-bad/.signature index 9b68cda16..f24012a8a 100644 --- a/gst-plugins-bad/.signature +++ b/gst-plugins-bad/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36Be8nL4b6J4seVevEACQl8SHi18QpPAMakxPZyASuodTLd0j0sFDi/xRKWDP66BsMqoO6l5UeJrap0pfwgxVAM= -SHA256 (Pkgfile) = d169721f86b92d0a1d67c00726930eaf90e2f46c8698540175eec56f938e3982 -SHA256 (.footprint) = c3b260516f5a032c78fdd4e873f3d5038444311737ca39c55b6a1730070b0080 +RWSagIOpLGJF38Y95rnQumfvEbgvRQeIC6Mp0UZcYmyZ1sDHmVeIi/9uzfmna3hn7f0K/KMgHOTnbLZR85r3KRGMs1vl7KvqhQQ= +SHA256 (Pkgfile) = 65a533ab704c519c806036c392201505fbc6cf4259376573ae3a1137a2b9956c +SHA256 (.footprint) = f797ae57f3ff97ed8bc8ab93cfa20c084c3d696242f4cbc4df725f51d8ef8395 SHA256 (gst-plugins-bad-1.18.5.tar.xz) = a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e +SHA256 (neon-0.32.x.patch) = 6b44a256d1ce3ed788d689a9abc5d8a2c4f992ce3c6c60f7a1efb4aa5cc3deb1 +SHA256 (wpe-1.1.patch) = 841988d7dffaf98adeff046cfeed97505a66d268c156361ac29c2b7a112cf984 diff --git a/gst-plugins-bad/Pkgfile b/gst-plugins-bad/Pkgfile index 2e78e26e4..eaf4a776e 100644 --- a/gst-plugins-bad/Pkgfile +++ b/gst-plugins-bad/Pkgfile @@ -1,24 +1,45 @@ # Description: A set of plugins for gstreamer that may pose distribution problems. # URL: https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: chromaprint e2fsprogs faac faad2 gst-plugins-base ladspa lame libass libdca libdvdnav libmms libmodplug libmpcdec librsvg libsndfile libsrtp libusb libva libvpx libwebp mjpegtools neon openal openjpeg rtmpdump x264 x265 -# Optional: brotli krb5 openldap +# Depends on: chromaprint dav1d faac faad2 fdk-aac libass libmodplug libnice libsrtp lilv mjpegtools nghttp2-libs openjpeg2 rtmpdump soundtouch x264 x265 bzip2 curl eudev expat libffi libgmp libpcre util-linux xz zlib zstd brotli ffmpeg flac glib gst-plugins-base gstreamer lame lcms2 libgudev libjpeg-turbo libogg libpng libsndfile libtheora libvorbis libvpx libwebp openal opus orc vulkan-loader libdrm libglvnd libva libvdpau ladspa neon bluez shaderc name=gst-plugins-bad version=1.18.5 -release=1 -source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz) +release=2 +source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz + neon-0.32.x.patch + wpe-1.1.patch) build() { - cd $name-$version + patch -d $name-$version -p3 -i $SRC/neon-0.32.x.patch + patch -d $name-$version -p1 -i $SRC/wpe-1.1.patch - meson build \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - -D buildtype=plain \ + meson build $name-$version \ + --prefix /usr \ + --libexecdir lib \ + --buildtype plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=true \ -D doc=disabled \ -D nls=disabled \ - -D package-name="GStreamer (CRUX Linux)" \ + -D directfb=disabled \ + -D flite=disabled \ + -D gsm=disabled \ + -D iqa=disabled \ + -D magicleap=disabled \ + -D msdk=disabled \ + -D openh264=disabled \ + -D openmpt=disabled \ + -D openni2=disabled \ + -D opensles=disabled \ + -D tinyalsa=disabled \ + -D voaacenc=disabled \ + -D voamrwbenc=disabled \ + -D wasapi2=disabled \ + -D wasapi=disabled \ + -D gobject-cast-checks=disabled \ + -D package-name="GStreamer Bad Plugins (CRUX Linux)" \ -D package-origin="https://crux.nu/" ninja -C build -j ${JOBS:-1} diff --git a/gst-plugins-bad/neon-0.32.x.patch b/gst-plugins-bad/neon-0.32.x.patch new file mode 100644 index 000000000..e467053c0 --- /dev/null +++ b/gst-plugins-bad/neon-0.32.x.patch @@ -0,0 +1,25 @@ +From b83e85ab677c79b46f520abebd1ee031e3a139c0 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Sun, 26 Sep 2021 21:34:30 +0200 +Subject: [PATCH] neon: Allow building against neon 0.32.x + +No API/ABI changes: https://github.com/notroj/neon/blob/0.32.0/NEWS#L3 + +Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1267> +--- + subprojects/gst-plugins-bad/ext/neon/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/subprojects/gst-plugins-bad/ext/neon/meson.build b/subprojects/gst-plugins-bad/ext/neon/meson.build +index bf49be9111..abd9763649 100644 +--- a/subprojects/gst-plugins-bad/ext/neon/meson.build ++++ b/subprojects/gst-plugins-bad/ext/neon/meson.build +@@ -1,4 +1,4 @@ +-neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.31.99'], ++neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.32.99'], + required : get_option('neon')) + + if neon_dep.found() +-- +GitLab + diff --git a/gst-plugins-bad/wpe-1.1.patch b/gst-plugins-bad/wpe-1.1.patch new file mode 100644 index 000000000..61de56752 --- /dev/null +++ b/gst-plugins-bad/wpe-1.1.patch @@ -0,0 +1,13 @@ +diff --git i/ext/wpe/meson.build w/ext/wpe/meson.build +index 9381e9b08..e94965c02 100644 +--- i/ext/wpe/meson.build ++++ w/ext/wpe/meson.build +@@ -6,7 +6,7 @@ if not gstgl_dep.found() + subdir_done() + endif + +-wpe_dep = dependency('wpe-webkit-1.0', version : '>= 2.24', required : get_option('wpe')) ++wpe_dep = dependency('wpe-webkit-1.1', version : '>= 2.24', required : get_option('wpe')) + wpe_fdo_dep = dependency('wpebackend-fdo-1.0', required : get_option('wpe')) + egl_dep = dependency('egl', required : get_option('wpe')) + xkbcommon_dep = dependency('xkbcommon', version : '>= 0.8', required : get_option('wpe'))