fix for taglib1 from extra repository

3 files changed, 33 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 101fc61d57f4..49c4cb8e1869 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = loudgain
 	pkgdesc = A loudness normalizer that scans music files and calculates loudness-normalized gain and loudness peak values according to the EBU R128 standard, and can optionally write ReplayGain-compatible metadata.
 	pkgver = v0.6.8
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/Moonbase59/loudgain
 	arch = i686
 	arch = x86_64
@@ -16,8 +16,10 @@ pkgbase = loudgain
 	source = loudgain-0.6.8.tar.gz::https://github.com/Moonbase59/loudgain/archive/v0.6.8.tar.gz
 	source = fix_ffmpeg5.patch
 	source = fix_mp4-asf.patch
+	source = taglib1.patch
 	sha256sums = 1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
 	sha256sums = 73c1cc5d416e2b5b73a4deac1ef2b563d289976c296c24b39c1e8d740333d2ff
 	sha256sums = 5c23a8cbee1e919f7dfe36c16652d8dfdd7e44dae0aa5dfd453fad4ba8c2a0b9
+	sha256sums = cfd687554d132f2de6be159a91c91fa31e2e1d3cb5c34987416055871f061f79
 
 pkgname = loudgain
diff --git a/PKGBUILD b/PKGBUILD
index 0e5ac45f160b..f69774f001c5 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=loudgain
 pkgver=v0.6.8
 _pkgver=0.6.8
-pkgrel=5
+pkgrel=6
 pkgdesc="A loudness normalizer that scans music files and calculates loudness-normalized gain and loudness peak values according to the EBU R128 standard, and can optionally write ReplayGain-compatible metadata."
 url="https://github.com/Moonbase59/loudgain"
 arch=('i686' 'x86_64')
@@ -14,25 +14,26 @@ makedepends=('cmake')
 provides=('loudgain' 'rgbpm')
 source=("loudgain-${_pkgver}.tar.gz::https://github.com/Moonbase59/loudgain/archive/${pkgver}.tar.gz"
         "fix_ffmpeg5.patch"
-        "fix_mp4-asf.patch")
+        "fix_mp4-asf.patch"
+        "taglib1.patch")
 sha256sums=('1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee'
             '73c1cc5d416e2b5b73a4deac1ef2b563d289976c296c24b39c1e8d740333d2ff'
-            '5c23a8cbee1e919f7dfe36c16652d8dfdd7e44dae0aa5dfd453fad4ba8c2a0b9')
+            '5c23a8cbee1e919f7dfe36c16652d8dfdd7e44dae0aa5dfd453fad4ba8c2a0b9'
+            'cfd687554d132f2de6be159a91c91fa31e2e1d3cb5c34987416055871f061f79')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${_pkgver}"
   patch --forward --strip=1 --input="${srcdir}/fix_ffmpeg5.patch"
   patch --forward --strip=1 --input="${srcdir}/fix_mp4-asf.patch"
+  patch --forward --strip=1 --input="${srcdir}/taglib1.patch"
 }
 
 build() {
+  export PKG_CONFIG_PATH=/usr/lib/taglib1/pkgconfig
   cd "${srcdir}/${pkgname}-${_pkgver}"
   mkdir -p build && cd build
-  env LIBRARY_PATH="/usr/lib/taglib1/lib/" \
-    PKG_CONFIG_PATH="/usr/lib/taglib1/lib/pkgconfig" \
-    cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-  env LIBRARY_PATH="/usr/lib/taglib1/lib/" \
-    make
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
 
 package() {
diff --git a/taglib1.patch b/taglib1.patch
new file mode 100644
index 000000000000..cf5568ab3400
--- /dev/null
+++ b/taglib1.patch
@@ -0,0 +1,21 @@
+diff --git a/./CMakeLists.txt.bak b/./CMakeLists.txt
+index 9487ab9..c48c90f 100644
+--- a/./CMakeLists.txt.bak
++++ b/./CMakeLists.txt
+@@ -61,11 +61,11 @@ SET(LIBS )
+ 
+ TARGET_LINK_LIBRARIES(loudgain
+   ${EBUR128_LIBRARY}
+-  ${LAVC_LIBRARIES}
+-  ${LAVF_LIBRARIES}
+-  ${LAVR_LIBRARIES}
+-  ${LAVU_LIBRARIES}
+-  ${LTAG_LIBRARIES}
++  ${LAVC_LINK_LIBRARIES}
++  ${LAVF_LINK_LIBRARIES}
++  ${LAVR_LINK_LIBRARIES}
++  ${LAVU_LINK_LIBRARIES}
++  ${LTAG_LINK_LIBRARIES}
+ )
+ 
+ SET_TARGET_PROPERTIES(loudgain PROPERTIES