fix build

2 files changed, 27 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5388fa8edbd2..e6ae3d155480 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = qaac-wine
 	pkgdesc = QuickTime AAC/ALAC encoder (wine version)
 	pkgver = 2.71
-	pkgrel = 1
+	pkgrel = 2
 	url = https://sites.google.com/site/qaacpage/
 	arch = x86_64
 	license = custom
 	makedepends = p7zip
 	makedepends = wine
 	makedepends = winetricks
+	makedepends = binutils
 	depends = wine
 	source = https://github.com/nu774/qaac/releases/download/v2.71/qaac_2.71.zip
 	source = iTunes64Setup.exe::https://www.apple.com/itunes/download/win64
diff --git a/PKGBUILD b/PKGBUILD
index 49f6b7b35b62..aa9d62cff608 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,13 @@
 pkgname=qaac-wine
 _pkgname=qaac
 pkgver=2.71
-pkgrel=1
+pkgrel=2
 pkgdesc="QuickTime AAC/ALAC encoder (wine version)"
 arch=('x86_64')
 url="https://sites.google.com/site/qaacpage/"
 license=('custom')
 depends=('wine')
-makedepends=('p7zip' 'wine' 'winetricks')
+makedepends=('p7zip' 'wine' 'winetricks' 'binutils')
 source=("https://github.com/nu774/qaac/releases/download/v${pkgver}/qaac_${pkgver}.zip"
         "iTunes64Setup.exe::https://www.apple.com/itunes/download/win64"
         "https://raw.githubusercontent.com/nu774/qaac/master/COPYING"
@@ -26,15 +26,29 @@ sha256sums=('f224f1da1e4fc1bd1096025dbb0eea9b4392422abb77810338ecb226b4497aa8'
             'SKIP'
             'b56ba8ca4a9f0fef6e0c636a4ee26a9c6a17f1e7ba301aef56fc7ddc0854be42')
 
+extract_filename() {
+    if [ "$(head -c 2 "$1" | tr -d '\0')" == "MZ" ]; then
+        objdump -p "$f" 2>/dev/null | grep 'The Export Tables' -A 10 | awk '$1 == "Name" { print $3 }'
+    fi
+}
+
 build() {
     cd "${srcdir}"
-    mkdir -p wineprefix
-    export WINEPREFIX=$PWD/wineprefix
-    export WINEARCH=win64
-    wineserver -k || true
-    DISPLAY= winetricks win7
-    WINEDLLOVERRIDES=winemenubuilder.exe=d msiexec /i "${srcdir}/iTunes64.msi" /qn
-    wineserver -k || true
+    #mkdir -p wineprefix
+    #export WINEPREFIX=$PWD/wineprefix
+    #export WINEARCH=win64
+    #wineserver -k || true
+    #DISPLAY= winetricks win7
+    #WINEDLLOVERRIDES=winemenubuilder.exe=d msiexec /i "${srcdir}/iTunes64.msi" /qn
+    #wineserver -k || true
+    7z x -y iTunes64.msi
+    for f in fil*; do
+        filename=$(extract_filename "$f")
+        if [ ! -z "$filename" ]; then
+            echo "$filename"
+            mv "$f" "$filename"
+        fi
+    done
 }
 
 package() {
@@ -47,9 +61,9 @@ package() {
     for f in libsoxconvolver64.dll libsoxr64.dll; do
         install -Dm644 "qaac_${pkgver}/x64/${f}" "${pkgdir}/usr/lib/qaac/${f}"
     done
-    local LIBICUDT_NAME=$(find 'wineprefix/drive_c/Program Files/iTunes' -name 'icudt*.dll' -printf '%f')
+    local LIBICUDT_NAME=$(find . -name 'icudt*.dll' -printf '%f')
     for f in ASL.dll CoreAudioToolbox.dll CoreFoundation.dll $LIBICUDT_NAME libdispatch.dll libicuin.dll libicuuc.dll objc.dll; do
-        install -Dm644 "wineprefix/drive_c/Program Files/iTunes/${f}" "${pkgdir}/usr/lib/qaac/${f}"
+        install -Dm644 "${f}" "${pkgdir}/usr/lib/qaac/${f}"
     done
     install -Dm755 wrapper.sh "${pkgdir}/usr/lib/qaac/wrapper.sh"