cleanup

3 files changed, 212 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 30ddce65182e..a3ea871699ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,7 +4,7 @@ pkgbase = lib32-gst-plugins-bad
 	pkgrel = 2
 	url = https://gstreamer.freedesktop.org/
 	arch = x86_64
-	license = LGPL
+	license = LGPL2.1
 	checkdepends = xorg-server-xvfb
 	makedepends = git
 	makedepends = lib32-bluez-libs
@@ -13,12 +13,14 @@ pkgbase = lib32-gst-plugins-bad
 	makedepends = lib32-ladspa
 	makedepends = lib32-libexif
 	makedepends = lib32-lv2
+	makedepends = lib32-shaderc
 	makedepends = lib32-vulkan-validation-layers
 	makedepends = meson
 	makedepends = python
-	makedepends = lib32-shaderc
 	makedepends = vulkan-headers
 	makedepends = wayland-protocols
+	depends = lib32-gst-plugins-base-libs>=1.18.5
+	depends = lib32-gst-plugins-good>=1.18.5
 	depends = lib32-aom
 	depends = lib32-bzip2
 	depends = lib32-chromaprint
@@ -26,16 +28,14 @@ pkgbase = lib32-gst-plugins-bad
 	depends = lib32-faac
 	depends = lib32-faad2
 	depends = lib32-fluidsynth
-	depends = lib32-gst-plugins-base-libs
-	depends = lib32-gst-plugins-good
 	depends = lib32-lcms2
 	depends = lib32-libass
 	depends = lib32-libavtp
 	depends = lib32-libbs2b
 	depends = lib32-libdc1394
-	depends = lib32-libdrm
 	depends = lib32-libdca
 	depends = lib32-libde265
+	depends = lib32-libdrm
 	depends = lib32-libdvdnav
 	depends = lib32-libdvdread
 	depends = lib32-libfdk-aac
@@ -81,14 +81,76 @@ pkgbase = lib32-gst-plugins-bad
 	depends = lib32-x265
 	depends = lib32-zbar
 	depends = lib32-zvbi
-	depends = gst-plugins-bad
 	optdepends = lib32-nvidia-utils: nvcodec plugin
 	options = !emptydirs
-	source = git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=d3af58d5b31941caa26c3ded85d7a7b84a91f0cc
+	source = https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz
 	source = 1267.patch
 	source = wpe-1.1.diff
-	sha256sums = SKIP
+	sha256sums = a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e
 	sha256sums = 6b44a256d1ce3ed788d689a9abc5d8a2c4f992ce3c6c60f7a1efb4aa5cc3deb1
 	sha256sums = 841988d7dffaf98adeff046cfeed97505a66d268c156361ac29c2b7a112cf984
 
 pkgname = lib32-gst-plugins-bad
+	depends = lib32-gst-plugins-base-libs>=1.18.5
+	depends = lib32-gst-plugins-good>=1.18.5
+	depends = lib32-aom
+	depends = lib32-bzip2
+	depends = lib32-chromaprint
+	depends = lib32-curl
+	depends = lib32-faac
+	depends = lib32-faad2
+	depends = lib32-fluidsynth
+	depends = lib32-lcms2
+	depends = lib32-libass
+	depends = lib32-libavtp
+	depends = lib32-libbs2b
+	depends = lib32-libdc1394
+	depends = lib32-libdca
+	depends = lib32-libde265
+	depends = lib32-libdrm
+	depends = lib32-libdvdnav
+	depends = lib32-libdvdread
+	depends = lib32-libfdk-aac
+	depends = lib32-libgme
+	depends = lib32-libgudev
+	depends = lib32-libkate
+	depends = lib32-liblrdf
+	depends = lib32-libmms
+	depends = lib32-libmodplug
+	depends = lib32-libmpcdec
+	depends = lib32-libnice
+	depends = lib32-libofa
+	depends = lib32-librsvg
+	depends = lib32-libsndfile
+	depends = lib32-libsrtp
+	depends = lib32-libusb
+	depends = lib32-libva
+	depends = lib32-libvdpau
+	depends = lib32-libwebp
+	depends = lib32-libx11
+	depends = lib32-libxcb
+	depends = lib32-libxkbcommon-x11
+	depends = lib32-libxml2
+	depends = lib32-lilv
+	depends = lib32-mjpegtools
+	depends = lib32-neon
+	depends = lib32-nettle
+	depends = lib32-openal
+	depends = lib32-openjpeg2
+	depends = lib32-openssl
+	depends = lib32-opus
+	depends = lib32-orc
+	depends = lib32-pango
+	depends = lib32-rtmpdump
+	depends = lib32-sbc
+	depends = lib32-soundtouch>=2.3.1
+	depends = lib32-spandsp
+	depends = lib32-srt
+	depends = lib32-vulkan-icd-loader
+	depends = lib32-wayland
+	depends = lib32-webrtc-audio-processing
+	depends = lib32-wildmidi
+	depends = lib32-x265
+	depends = lib32-zbar
+	depends = lib32-zvbi
+	depends = gst-plugins-bad>=1.18.5
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..37e9c447f1ae
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+gst-common/
+gst-plugins-ugly/
+*.pkg.tar.*
+*.pkg.tar
+pkg/
+src/
+*.orig
+*.bak
+*.backup
diff --git a/PKGBUILD b/PKGBUILD
index e031cdca5122..c8ce0d40071c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,106 @@
-# Maintainer: Rodrigo Bezerra <rodrigobezerra21 at gmail dot com>
+# Maintainer:  Marcell Meszaros < marcell.meszaros AT runbox.eu >
+# Contributor: Rodrigo Bezerra <rodrigobezerra21 at gmail dot com>
 # Contributor: orumin <dev@orum.in>
 
-_basename=gst-plugins-bad
-pkgname=lib32-gst-plugins-bad
+pkgname='lib32-gst-plugins-bad'
+_basename="${pkgname#lib32-}"
 pkgver=1.18.5
 pkgrel=2
-pkgdesc="Multimedia graph framework - bad plugins (32-bit)"
-url="https://gstreamer.freedesktop.org/"
-arch=(x86_64)
-license=(LGPL)
-depends=(lib32-aom lib32-bzip2 lib32-chromaprint lib32-curl lib32-faac lib32-faad2
-        lib32-fluidsynth lib32-gst-plugins-base-libs lib32-gst-plugins-good
-        lib32-lcms2 lib32-libass lib32-libavtp lib32-libbs2b lib32-libdc1394 lib32-libdrm
-        lib32-libdca lib32-libde265 lib32-libdvdnav lib32-libdvdread lib32-libfdk-aac
-        lib32-libgme lib32-libgudev lib32-libkate lib32-liblrdf lib32-libmms lib32-libmodplug
-        lib32-libmpcdec lib32-libnice lib32-libofa lib32-librsvg lib32-libsndfile
-        lib32-libsrtp lib32-libusb lib32-libva lib32-libvdpau lib32-libwebp lib32-libx11
-        lib32-libxcb lib32-libxkbcommon-x11 lib32-libxml2 lib32-lilv lib32-mjpegtools lib32-neon
-        lib32-nettle lib32-openal lib32-openjpeg2 lib32-openssl lib32-opus lib32-orc
-        lib32-pango lib32-rtmpdump lib32-sbc 'lib32-soundtouch>=2.3.1' lib32-spandsp lib32-srt
-        lib32-vulkan-icd-loader lib32-wayland lib32-webrtc-audio-processing lib32-wildmidi
-        lib32-x265 lib32-zbar lib32-zvbi gst-plugins-bad)
-makedepends=(git lib32-bluez-libs lib32-glu lib32-gtk3 lib32-ladspa lib32-libexif lib32-lv2 lib32-vulkan-validation-layers
-             meson python lib32-shaderc vulkan-headers wayland-protocols)
+pkgdesc='Multimedia graph framework - bad plugins (32-bit)'
+arch=('x86_64')
+url='https://gstreamer.freedesktop.org/'
+license=('LGPL2.1')
+depends=(
+    "lib32-gst-plugins-base-libs>=${pkgver}"
+    "lib32-gst-plugins-good>=${pkgver}"
+    'lib32-aom'
+    'lib32-bzip2'
+    'lib32-chromaprint'
+    'lib32-curl'
+    'lib32-faac'
+    'lib32-faad2'
+    'lib32-fluidsynth'
+    'lib32-lcms2'
+    'lib32-libass'
+    'lib32-libavtp'
+    'lib32-libbs2b'
+    'lib32-libdc1394'
+    'lib32-libdca'
+    'lib32-libde265'
+    'lib32-libdrm'
+    'lib32-libdvdnav'
+    'lib32-libdvdread'
+    'lib32-libfdk-aac'
+    'lib32-libgme'
+    'lib32-libgudev'
+    'lib32-libkate'
+    'lib32-liblrdf'
+    'lib32-libmms'
+    'lib32-libmodplug'
+    'lib32-libmpcdec'
+    'lib32-libnice'
+    'lib32-libofa'
+    'lib32-librsvg'
+    'lib32-libsndfile'
+    'lib32-libsrtp'
+    'lib32-libusb'
+    'lib32-libva'
+    'lib32-libvdpau'
+    'lib32-libwebp'
+    'lib32-libx11'
+    'lib32-libxcb'
+    'lib32-libxkbcommon-x11'
+    'lib32-libxml2'
+    'lib32-lilv'
+    'lib32-mjpegtools'
+    'lib32-neon'
+    'lib32-nettle'
+    'lib32-openal'
+    'lib32-openjpeg2'
+    'lib32-openssl'
+    'lib32-opus'
+    'lib32-orc'
+    'lib32-pango'
+    'lib32-rtmpdump'
+    'lib32-sbc'
+    'lib32-soundtouch>=2.3.1'
+    'lib32-spandsp'
+    'lib32-srt'
+    'lib32-vulkan-icd-loader'
+    'lib32-wayland'
+    'lib32-webrtc-audio-processing'
+    'lib32-wildmidi'
+    'lib32-x265'
+    'lib32-zbar'
+    'lib32-zvbi'
+)
+makedepends=(
+    'git'
+    'lib32-bluez-libs'
+    'lib32-glu'
+    'lib32-gtk3'
+    'lib32-ladspa'
+    'lib32-libexif'
+    'lib32-lv2'
+    'lib32-shaderc'
+    'lib32-vulkan-validation-layers'
+    'meson'
+    'python'
+    'vulkan-headers'
+    'wayland-protocols'
+)
+checkdepends=('xorg-server-xvfb')
 optdepends=('lib32-nvidia-utils: nvcodec plugin')
-checkdepends=(xorg-server-xvfb)
-options=(!emptydirs)
-_commit=d3af58d5b31941caa26c3ded85d7a7b84a91f0cc # tags/1.18.5^0
-source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit"
-        1267.patch
-        wpe-1.1.diff)
-sha256sums=('SKIP'
+options=('!emptydirs')
+source=("${url}src/${_basename}/${_basename}-${pkgver}.tar.xz"
+        '1267.patch'
+        'wpe-1.1.diff')
+sha256sums=('a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e'
             '6b44a256d1ce3ed788d689a9abc5d8a2c4f992ce3c6c60f7a1efb4aa5cc3deb1'
             '841988d7dffaf98adeff046cfeed97505a66d268c156361ac29c2b7a112cf984')
 
-pkgver() {
-    cd $_basename
-
-    git describe --tags | sed 's/-/+/g'
-}
-
 prepare() {
-    cd $_basename
+    cd "${_basename}"
 
     # Neon 0.32.x
     # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1267
@@ -49,44 +108,46 @@ prepare() {
 
     # wpe-webkit-1.1 (libsoup3)
     patch -Np1 -i ../wpe-1.1.diff
-}
 
-build() {
+    # configure
     export CC='gcc -m32'
     export CXX='g++ -m32'
+    export CFLAGS+=" ${LDFLAGS}"    # otherwise meson (or the project) ignores LDFLAGS
     export PKG_CONFIG='/usr/bin/i686-pc-linux-gnu-pkg-config'
 
-    arch-meson $_basename build \
-        --libdir=lib32 \
-        --libexecdir=lib32 \
-        -D introspection=disabled \
-        -D doc=disabled \
-        -D directfb=disabled \
-        -D flite=disabled \
-        -D gsm=disabled \
-        -D iqa=disabled \
-        -D magicleap=disabled \
-        -D msdk=disabled \
-        -D opencv=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 wpe=disabled \
-        -D gobject-cast-checks=disabled \
-        -D microdns=disabled \
-        -D svthevcenc=disabled \
-        -D zxing=disabled \
-        -D openexr=disabled \
-        -D package-name="GStreamer Bad Plugins (Arch Linux)" \
-        -D package-origin="https://www.archlinux.org/"
+    arch-meson $_basename 'build' \
+        --libdir='lib32' \
+        --libexecdir='lib32' \
+        -Dintrospection='disabled' \
+        -Ddoc='disabled' \
+        -Ddirectfb='disabled' \
+        -Dflite='disabled' \
+        -Dgsm='disabled' \
+        -Diqa='disabled' \
+        -Dmagicleap='disabled' \
+        -Dmsdk='disabled' \
+        -Dopencv='disabled' \
+        -Dopenh264='disabled' \
+        -Dopenmpt='disabled' \
+        -Dopenni2='disabled' \
+        -Dopensles='disabled' \
+        -Dtinyalsa='disabled' \
+        -Dvoaacenc='disabled' \
+        -Dvoamrwbenc='disabled' \
+        -Dwasapi2='disabled' \
+        -Dwasapi='disabled' \
+        -Dwpe='disabled' \
+        -Dgobject-cast-checks='disabled' \
+        -Dmicrodns='disabled' \
+        -Dsvthevcenc='disabled' \
+        -Dzxing='disabled' \
+        -Dopenexr='disabled' \
+        -Dpackage-name="Arch Linux ${pkgname} ${pkgver}-${pkgrel}" \
+        -Dpackage-origin='https://www.archlinux.org/'
+}
 
-    meson compile -C build
+build() {
+    meson compile -C 'build'
 }
 
 check() (
@@ -95,11 +156,14 @@ check() (
 
     # elements_dtls test hangs sometimes
     xvfb-run -s '-nolisten local' \
-        meson test -C build --print-errorlogs || :
+        meson test -C 'build' --print-errorlogs || :
 )
 
 package() {
-    meson install -C build --destdir "$pkgdir"
+    # 64-bit lib not needed during build, only if package is installed, for shared header includes
+    depends+=("${_basename}>=${pkgver}")
+
+    meson install -C 'build' --destdir "${pkgdir}"
 
     rm -rf "${pkgdir}"/usr/{bin,include,share}
 }