[arch-commits] Commit in gst-plugins-bad/trunk (PKGBUILD)

Jan Steffens heftig at archlinux.org
Mon Jan 21 12:26:13 UTC 2019


    Date: Monday, January 21, 2019 @ 12:26:12
  Author: heftig
Revision: 344551

Replace patch with cherry-picks

Modified:
  gst-plugins-bad/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-21 10:36:05 UTC (rev 344550)
+++ PKGBUILD	2019-01-21 12:26:12 UTC (rev 344551)
@@ -17,11 +17,9 @@
              vulkan-validation-layers librsvg libtiger zbar fluidsynth lilv)
 _commit=566e4ecc223b18fce8bd932f5e4885f41f746dd4  # tags/1.14.4^0
 source=("git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-bad#commit=$_commit"
-        'gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common'
-        'gst-fdkaac2.patch::https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/77.patch')
+        'gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common')
 sha256sums=('SKIP'
-            'SKIP'
-            '2325b2283a324a938bd5f1e600f344f2c71d99a2ac974564737dc75ab4c8d052')
+            'SKIP')
 
 pkgver() {
   cd $pkgname
@@ -32,7 +30,9 @@
   cd $pkgname
 
   # libfdk-aac 2.0.0
-  patch -Np1 -i ../gst-fdkaac2.patch
+  git cherry-pick -n \
+    f4fdb9770c76113f38515245fecc5f11b3ace20d \
+    19d34f6b5e1633d5ec4bb2832c58470f0c829cab
 
   git submodule init
   git config --local submodule.common.url "$srcdir/gst-common"



More information about the arch-commits mailing list