From 5e1f3e58ac4b3bda1c13a1c1094e6f83192d29f7 Mon Sep 17 00:00:00 2001
From: Peter Marquardt <wwwutz@molgen.mpg.de>
Date: Thu, 26 Jan 2023 10:28:32 +0100
Subject: [PATCH] libvpx: update from 1.8.2 to 1.12.0

- libvpx: update to 1.12.0
- ffmpeg_compat: remove libvpx
- libvpx_compat: remove version from be0file
- libvpx_compat: add 1.8.2
---
 ffmpeg_compat.be0       | 24 +++++++++++++-----------
 libvpx.be0              |  4 ++--
 libvpx_compat-1.2.0.be0 | 17 -----------------
 libvpx_compat.be0       | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 30 deletions(-)
 delete mode 100755 libvpx_compat-1.2.0.be0
 create mode 100755 libvpx_compat.be0

diff --git a/ffmpeg_compat.be0 b/ffmpeg_compat.be0
index d041a2342..99015043d 100755
--- a/ffmpeg_compat.be0
+++ b/ffmpeg_compat.be0
@@ -1,16 +1,23 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION ffmpeg_compat-1.0.1-1
+# BEE_VERSION ffmpeg_compat-1.0.2-0
+
+SRCURL+=("https://beehive.molgen.mpg.de/98308cc7b342c455773911a04fd9dbbc/ffmpeg-3.4.5-0.x86_64.bee.tar.bz2")
+SRCURL+=("https://beehive.molgen.mpg.de/2fb9df854714faf7c0cbb708db54c115/ffmpeg-1.2.4-2.x86_64.bee.tar.bz2")
+SRCURL+=("https://beehive.molgen.mpg.de/9b86a91409b3f2076206ee3980ab69d8/ffmpeg-0.6.1-0.x86_64.bee.tar.bz2")
+SRCURL+=("https://beehive.molgen.mpg.de/aa8efbb6625170c1ef639c06576f8b88/x264-20110322_2245-0.x86_64.bee.tar.bz2")
 
-SRCURL[0]="https://beehive.molgen.mpg.de/98308cc7b342c455773911a04fd9dbbc/ffmpeg-3.4.5-0.x86_64.bee.tar.bz2"
-SRCURL[1]="https://beehive.molgen.mpg.de/2fb9df854714faf7c0cbb708db54c115/ffmpeg-1.2.4-2.x86_64.bee.tar.bz2"
-SRCURL[2]="https://beehive.molgen.mpg.de/9b86a91409b3f2076206ee3980ab69d8/ffmpeg-0.6.1-0.x86_64.bee.tar.bz2"
-SRCURL[3]="https://beehive.molgen.mpg.de/63c3b56f060ac7ea1cefdea687359cc7/libvpx-0.9.5-0.x86_64.bee.tar.bz2"
-SRCURL[4]="https://beehive.molgen.mpg.de/aa8efbb6625170c1ef639c06576f8b88/x264-20110322_2245-0.x86_64.bee.tar.bz2"
 # build_in_sourcedir
 
 # sourcesubdir_append src
 
+mee_getsources() {
+  mkdir -pv ${F}
+  for srcurl in ${SRCURL[@]}; do
+    fetch_one_file $srcurl
+  done
+}
+
 #mee_extract() {
 #    bee_extract "${@}"
 #}
@@ -69,11 +76,6 @@ mee_install() {
 		/usr/lib/libswscale.so.0 \
 		/usr/lib/libswscale.so.0.11.0
 
-	tar xpf ${F}/libvpx-0.9.5-0.x86_64.bee.tar.bz2 \
-		/usr/lib/libvpx.so.0 \
-		/usr/lib/libvpx.so.0.9 \
-		/usr/lib/libvpx.so.0.9.5
-
 	tar xpf ${F}/x264-20110322_2245-0.x86_64.bee.tar.bz2 \
 		/usr/lib/libx264.so.114
 }
diff --git a/libvpx.be0 b/libvpx.be0
index 0eb1a7de1..ec1b5cdce 100755
--- a/libvpx.be0
+++ b/libvpx.be0
@@ -1,9 +1,9 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION libvpx-1.8.2-0
+# BEE_VERSION libvpx-1.12.0-0
 
 # SRCURL[0]="https://github.com/webmproject/libvpx/archive/v${PKGVERSION}/libvpx-${PKGVERSION}.tar.gz"
-SRCURL[0]="https://beehive.molgen.mpg.de/6dbccca688886c66a216d7e445525bce/libvpx-1.8.2.tar.gz"
+SRCURL[0]="https://beehive.molgen.mpg.de/10cf85debdd07be719a35ca3bfb8ea64/libvpx-1.12.0.tar.gz"
 
 # PATCHURL+=()
 
diff --git a/libvpx_compat-1.2.0.be0 b/libvpx_compat-1.2.0.be0
deleted file mode 100755
index 89ed477f4..000000000
--- a/libvpx_compat-1.2.0.be0
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env beesh
-
-# BEE_VERSION libvpx_compat-1.2.0-1
-
-# /src/mariux/md5repo.sh /src/mariux/beeroot/packages/libvpx-1.2.0-0.x86_64.bee.tar.bz2
-
-mee_getsources() {
-  mkdir -p ${F}
-  fetch_one_file "https://beehive.molgen.mpg.de/17dcfb3e98f8e1eae58a5812653f96bb/libvpx-1.2.0-0.x86_64.bee.tar.bz2"
-}
-
-mee_install() {
-  cd ${D}
-  tar -xf ${F}/libvpx-1.2.0-0.x86_64.bee.tar.bz2 \
-    /usr/lib/libvpx.so.1.2.0 \
-    /usr/lib/libvpx.so.1
-}
diff --git a/libvpx_compat.be0 b/libvpx_compat.be0
new file mode 100755
index 000000000..59f54f1a1
--- /dev/null
+++ b/libvpx_compat.be0
@@ -0,0 +1,34 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION libvpx_compat-1.8.2-0
+
+# /src/mariux/md5repo.sh /src/mariux/beeroot/packages/libvpx-0.9.5-0.x86_64.bee.tar.bz2
+# /src/mariux/md5repo.sh /src/mariux/beeroot/packages/libvpx-1.2.0-0.x86_64.bee.tar.bz2
+# /src/mariux/md5repo.sh /src/mariux/beeroot/packages/libvpx-1.8.2-1.x86_64.bee.tar.bz2
+
+SRCURL+=("https://beehive.molgen.mpg.de/17dcfb3e98f8e1eae58a5812653f96bb/libvpx-1.2.0-0.x86_64.bee.tar.bz2")
+SRCURL+=("https://beehive.molgen.mpg.de/c063d4c59cb7a3ba5899f0076d1820a9/libvpx-1.8.2-1.x86_64.bee.tar.bz2")
+SRCURL+=("https://beehive.molgen.mpg.de/63c3b56f060ac7ea1cefdea687359cc7/libvpx-0.9.5-0.x86_64.bee.tar.bz2")
+
+mee_getsources() {
+  mkdir -p ${F}
+  for srcurl in ${SRCURL[@]}; do
+    fetch_one_file $srcurl
+  done
+}
+
+mee_install() {
+  cd ${D}
+
+  tar xpf ${F}/libvpx-0.9.5-0.x86_64.bee.tar.bz2 \
+    /usr/lib/libvpx.so.0 \
+    /usr/lib/libvpx.so.0.9.5
+
+  tar -xf ${F}/libvpx-1.2.0-0.x86_64.bee.tar.bz2 \
+    /usr/lib/libvpx.so.1.2.0 \
+    /usr/lib/libvpx.so.1
+
+  tar -xf ${F}/libvpx-1.8.2-1.x86_64.bee.tar.bz2 \
+    /usr/lib/libvpx.so.6.2.0 \
+    /usr/lib/libvpx.so.6
+}