Proper fix for changes to firefox plugin detection

5 files changed, 16 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2cef2017e257..5939fc9698d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = widevine-armv7h
 	pkgdesc = A browser plugin designed for the viewing of premium video content (version for armv7h)
 	pkgver = 4.10.2257.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.widevine.com/
 	install = widevine-armv7h.install
 	arch = armv7h
@@ -23,7 +23,7 @@ pkgbase = widevine-armv7h
 	sha256sums = SKIP
 	sha256sums = 5b1199bcd3471d126098be42ca0af0e486302df94cdf4643e4fe2a86d4c4c7d1
 	sha256sums = ebca260ca197c4eee5a8b76ae1fad2bf800ab99b40d8be0c2189b566bd9621d0
-	sha256sums = b976bb594b8b51d5eee1929defaebd0313c54ddd6d62241bfa4a7d5421491e12
-	sha256sums = 6be10c8786b24f47dbbb54ff676f28a7b49771b8d5f7c03cc3f2e73b7e18c22f
+	sha256sums = a806dc002b8072651902f77c47cba09b9d0c0dd50e196651e235255f6e0a2cbc
+	sha256sums = 5991822a0c6bf24b33eb65e6ecad1ced6df4975c2ea03df71acb2795293f7a6c
 
 pkgname = widevine-armv7h
diff --git a/PKGBUILD b/PKGBUILD
index 7e2610a48948..5a1d8e402b7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.10.2257.0
 _debian_pkgname='libwidevinecdm0'
 _debian_pkgver=4.10.2252.0
 _debian_pkgrel=+3
-pkgrel=4
+pkgrel=5
 arch=('armv7h')
 url='https://www.widevine.com/'
 license=('custom')
@@ -23,8 +23,8 @@ source=("chrome-eula_text.html::https://www.google.com/intl/en/chrome/privacy/eu
 sha256sums=(SKIP
             '5b1199bcd3471d126098be42ca0af0e486302df94cdf4643e4fe2a86d4c4c7d1'
             'ebca260ca197c4eee5a8b76ae1fad2bf800ab99b40d8be0c2189b566bd9621d0'
-            'b976bb594b8b51d5eee1929defaebd0313c54ddd6d62241bfa4a7d5421491e12'
-            '6be10c8786b24f47dbbb54ff676f28a7b49771b8d5f7c03cc3f2e73b7e18c22f')
+            'a806dc002b8072651902f77c47cba09b9d0c0dd50e196651e235255f6e0a2cbc'
+            '5991822a0c6bf24b33eb65e6ecad1ced6df4975c2ea03df71acb2795293f7a6c')
 
 prepare() {
   # Extract data.tar.gz from deb package
@@ -62,15 +62,13 @@ package() {
 
   # These are the files for the chromium metadata package
   install -d "${pkgdir}/opt/WidevineCdm/chromium/_platform_specific/linux_arm"
-  install -Dm755 opt/WidevineCdm/_platform_specific/linux_arm/libwidevinecdm.so -t "${pkgdir}/opt/WidevineCdm/chromium/"
+  install -Dm755 opt/WidevineCdm/_platform_specific/linux_arm/libwidevinecdm.so -t "${pkgdir}/opt/WidevineCdm/chromium/_platform_specific/linux_arm/"
   install -m644 manifest.json -t "${pkgdir}/opt/WidevineCdm/chromium/"
-  ln -s "../../libwidevinecdm.so" "${pkgdir}/opt/WidevineCdm/chromium/_platform_specific/linux_arm/libwidevinecdm.so"
-  # workaround for a firefox 104 issue (i.e. it's looking for libvineCdm.so instead of the proper so lib)
-  ln -s "./libwidevinecdm.so" "${pkgdir}/opt/WidevineCdm/chromium/libvineCdm.so"
 
   # These are the files for the firefox metadata package
-  install -d "${pkgdir}/opt/WidevineCdm/firefox"
-  ln -s "../chromium" "${pkgdir}/opt/WidevineCdm/firefox/${pkgver}"
+  install -d "${pkgdir}/opt/WidevineCdm/firefox/gmp-widevinecdm/${pkgver}/"
+  ln -s "../../../chromium/_platform_specific/linux_arm/libwidevinecdm.so" "${pkgdir}/opt/WidevineCdm/firefox/gmp-widevinecdm/${pkgver}/libwidevinecdm.so"
+  ln -s "../../../chromium/manifest.json" "${pkgdir}/opt/WidevineCdm/firefox/gmp-widevinecdm/${pkgver}/manifest.json"
   install -Dm644 widevine.js -t "${pkgdir}/usr/lib/firefox/browser/defaults/preferences/"
 
   # Registering scripts
diff --git a/ldadd_swp.c b/ldadd_swp.c
deleted file mode 100644
index d664837d0d8d..000000000000
--- a/ldadd_swp.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdint.h>
-
-__attribute__((target("no-outline-atomics")))
-int32_t __aarch64_ldadd4_acq_rel(int32_t value, int32_t *ptr)
-{
-    return __atomic_fetch_add(ptr, value, __ATOMIC_ACQ_REL);
-}
-
-__attribute__((target("no-outline-atomics")))
-int32_t __aarch64_swp4_acq_rel(int32_t value, int32_t *ptr)
-{
-    return __atomic_exchange_n(ptr, value, __ATOMIC_ACQ_REL);
-}
diff --git a/register_widevine_firefox b/register_widevine_firefox
index a7fe4092aee1..fbbc6753d67e 100755
--- a/register_widevine_firefox
+++ b/register_widevine_firefox
@@ -24,14 +24,14 @@ do
         else
            rm -r "${WIDEVINE_PATH}"
         fi
-        ln -s /opt/WidevineCdm/firefox "${WIDEVINE_PATH}"
+        ln -s /opt/WidevineCdm/firefox/gmp-widevinecdm "${WIDEVINE_PATH}"
         echo "Widevine already registered for profile ${prof}; re-registered"
     else
         if [[ -L "${WIDEVINE_PATH}" ]]
         then
            rm "${WIDEVINE_PATH}"
         fi
-        ln -s /opt/WidevineCdm/firefox "${HOME}/.mozilla/firefox/${prof}/gmp-widevinecdm"
+        ln -s /opt/WidevineCdm/firefox/gmp-widevinecdm "${HOME}/.mozilla/firefox/${prof}/gmp-widevinecdm"
         echo "Widevine registered for profile ${prof}"
     fi
 done
diff --git a/widevine-armv7h.install b/widevine-armv7h.install
index 5548a44dc179..1c476ed66c47 100644
--- a/widevine-armv7h.install
+++ b/widevine-armv7h.install
@@ -11,3 +11,7 @@ post_install() {
   echo ":: IMPORTANT (2): WidevineCDM on ARM now requires patches to glibc.  Therefore"
   echo "   a dependency to the AUR package glibc-widevine has been added."
 }
+
+post_upgrade() {
+  echo ":: IMPORTANT: Firefox users please re-register the plugin by running register_widevine_firefox"
+}