build: Switch to xz archive and other stuff

2 files changed, 29 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0eaed5b7979..e3d6c568421d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = cef-minimal-obs-rc-bin
 	pkgdesc = Chromium Embedded Framework minimal release needed by OBS Studio beta release in /opt/cef-obs
 	pkgver = 103.0.0_5060_shared_textures_143.2591+g4204d54+chromium_103.0.5060.134_1
-	pkgrel = 3
+	pkgrel = 4
 	epoch = 1
 	url = https://github.com/obsproject/cef/tree/5060-shared-textures
 	arch = x86_64
+	arch = aarch64
 	license = BSD
 	makedepends = cmake
 	depends = nss
@@ -21,7 +22,9 @@ pkgbase = cef-minimal-obs-rc-bin
 	options = !lto
 	options = !strip
 	options = debug
-	source_x86_64 = https://cdn-fastly.obsproject.com/downloads/cef_binary_5060_linux64.tar.bz2
-	sha256sums_x86_64 = ac4e2a8ebf20700e4e36353e314f876623633dd5b474778a2548bb66bdbea11d
+	source_x86_64 = https://cdn-fastly.obsproject.com/downloads/cef_binary_5060_linux_x86_64.tar.xz
+	sha256sums_x86_64 = bf4aa9388bab7e94fa945cc3bba16b6da63b6a30f9c0342d42235468b39d84bf
+	source_aarch64 = https://cdn-fastly.obsproject.com/downloads/cef_binary_5060_linux_aarch64.tar.xz
+	sha256sums_aarch64 = 68d915c9ba2639cba762a54cd3430fce2527aa6355d831d3cfcb6157664206b0
 
 pkgname = cef-minimal-obs-rc-bin
diff --git a/PKGBUILD b/PKGBUILD
index 683a2f6d6a9c..4058c519d7ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,10 +8,10 @@ _cefbranch="5060"
 _chromiumver="103.0.${_cefbranch}.134"
 _rebuild="1" # The tarball sometime can get rebuild by OBS Project
 pkgver="${_version}+g${_commit}+chromium_${_chromiumver}_${_rebuild}"
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc="Chromium Embedded Framework minimal release needed by OBS Studio beta release in /opt/cef-obs"
-arch=("x86_64")
+arch=("x86_64" "aarch64")
 url="https://github.com/obsproject/cef/tree/5060-shared-textures"
 license=("BSD")
 depends=("nss" "alsa-lib" "pango" "libxrandr" "libxcomposite"
@@ -21,26 +21,15 @@ provides=("cef-minimal-obs=$pkgver")
 conflicts=("cef-minimal-obs")
 # Prevent people from using link time optimisation for this package because it make OBS unable to be built against it
 options=('!lto' '!strip' 'debug')
-source_x86_64=("https://cdn-fastly.obsproject.com/downloads/cef_binary_${_cefbranch}_linux64.tar.bz2")
-sha256sums_x86_64=("ac4e2a8ebf20700e4e36353e314f876623633dd5b474778a2548bb66bdbea11d")
-
-
-# Kept for future-proofing, OBS now provide a custom CEF with some additions only for x86_64
-if [[ $CARCH == 'x86_64' ]]; then
-  _arch=64
-  _parch=x86_64
-elif [[ $CARCH == 'i686' ]]; then
-  _arch=32
-  _parch=x86
-elif [[ $CARCH == 'aarch64' ]]; then
-  _arch=arm64
-  _parch=arm64
-fi
+source_x86_64=("https://cdn-fastly.obsproject.com/downloads/cef_binary_${_cefbranch}_linux_x86_64.tar.xz")
+source_aarch64=("https://cdn-fastly.obsproject.com/downloads/cef_binary_${_cefbranch}_linux_aarch64.tar.xz")
+sha256sums_x86_64=("bf4aa9388bab7e94fa945cc3bba16b6da63b6a30f9c0342d42235468b39d84bf")
+sha256sums_aarch64=("68d915c9ba2639cba762a54cd3430fce2527aa6355d831d3cfcb6157664206b0")
 
 prepare() {
-  cd "$srcdir"/cef_binary_${_cefbranch}_linux${_arch}
+  cd "${srcdir}/cef_binary_${_cefbranch}_linux_${arch}"
 
-  # Fix permissions
+  # Fix folder permissions
   chmod 755 Release
   chmod 755 Resources
   chmod 755 Resources/locales
@@ -54,23 +43,31 @@ prepare() {
   chmod 755 include/test
   chmod 755 include/views
   chmod 755 include/wrapper
+  chmod 755 libcef_dll
+  chmod 755 libcef_dll/base
+  chmod 755 libcef_dll/cpptoc
+  chmod 755 libcef_dll/cpptoc/test
+  chmod 755 libcef_dll/cpptoc/views
+  chmod 755 libcef_dll/ctocpp
+  chmod 755 libcef_dll/ctocpp/test
+  chmod 755 libcef_dll/ctocpp/views
+  chmod 755 libcef_dll/wrapper
 
   # Remove pre-built wrapper
   rm -rf build
 }
 
 build() {
-  cd "$srcdir"/cef_binary_${_cefbranch}_linux${_arch}
+  cd "${srcdir}/cef_binary_${_cefbranch}_linux_${arch}"
 
-  #The arm64 CEF set the wrong arch for the project
   cmake \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DPROJECT_ARCH=$_parch .
+    -DPROJECT_ARCH=$arch .
 
   make libcef_dll_wrapper
 
   # Remove unneeded files
-  rm -f CMakeCache.txt Makefile cmake_install.cmake
+  rm -f CMakeLists.txt CMakeCache.txt Makefile cmake_install.cmake README.txt libcef_dll/CMakeLists.txt
   rm -rf CMakeFiles
     
   cd libcef_dll_wrapper
@@ -80,8 +77,8 @@ build() {
 
 package() {
     mkdir -p "$pkgdir"/opt/cef-obs/
-    cp -a "$srcdir"/cef_binary_${_cefbranch}_linux${_arch}/* "$pkgdir"/opt/cef-obs
-    rm -f "$pkgdir"/opt/cef-obs/CMakeLists.txt "$pkgdir"/opt/cef-obs/LICENSE.txt "$pkgdir"/opt/cef-obs/README.txt
+    cp -a "${srcdir}/cef_binary_${_cefbranch}_linux_${arch}"/* "$pkgdir"/opt/cef-obs
+    rm -f "$pkgdir"/opt/cef-obs/LICENSE.txt
     rm -rf "$pkgdir"/opt/cef-obs/cmake
-    install -Dm644 "$srcdir"/cef_binary_${_cefbranch}_linux${_arch}/LICENSE.txt "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE
+    install -Dm644 "${srcdir}/cef_binary_${_cefbranch}_linux_${arch}/LICENSE.txt" "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE
 }