fix errors

2 files changed, 23 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 808dbddd1a5b..fee6d77b43e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qtvsplayer-bin
 	pkgdesc = QtVsPlayer for Hikvision, QtVsPlayer can read local video files of Hikvision and display blue, green and red vector.It read real time live stream
 	pkgver = 1.0.51_3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/surfzoid/QtVsPlayer
 	arch = aarch64
 	arch = x86_64
@@ -18,8 +18,8 @@ pkgbase = qtvsplayer-bin
 	depends = openssl-1.1
 	conflicts = qtvsplayer
 	source_aarch64 = qtvsplayer-1.0.51_3-aarch64.deb::https://github.com/surfzoid/QtVsPlayer/releases/download/1.0.51-3/QtVsPlayer_1.0.51-3_bullseye-arm64.deb
-	sha256sums_aarch64 = 594248bf10f534ecd110018702269de7c3f182d42bdfc92952a97f95889ab3a5
+	sha256sums_aarch64 = 9831ed2ca84c2d36920f19f821c8586a0c407e30d7c16b61674b78f0997ea7bf
 	source_x86_64 = qtvsplayer-1.0.51_3-x86_64.deb::https://github.com/surfzoid/QtVsPlayer/releases/download/1.0.51-3/QtVsPlayer_1.0.51-3_ubuntu-latest-amd64.deb
-	sha256sums_x86_64 = 11ea38fe6da972257caa522ecb7916773b22b98613679b499a381a92ee177c2e
+	sha256sums_x86_64 = 01de6b381b38829190ef684da106da0d45c343edc43cd35819d6190e5052eb47
 
 pkgname = qtvsplayer-bin
diff --git a/PKGBUILD b/PKGBUILD
index e2e81ea2fa19..18d6edeaa68c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,31 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=qtvsplayer-bin
-_appname=QtVsPlayer
+_pkgname=QtVsPlayer
 pkgver=1.0.51_3
-pkgrel=1
+pkgrel=2
 pkgdesc="QtVsPlayer for Hikvision, QtVsPlayer can read local video files of Hikvision and display blue, green and red vector.It read real time live stream"
 arch=('aarch64' 'x86_64')
 url="https://github.com/surfzoid/QtVsPlayer"
 license=("GPL3")
 depends=('freetype2' 'zlib' 'util-linux-libs' 'glibc' 'qt5-base' 'libx11' 'libglvnd' 'gcc-libs' 'openal' 'openssl-1.1')
 conflicts=("${pkgname%-bin}")
-source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.deb::${url}/releases/download/${pkgver//_/-}/${_appname}_${pkgver//_/-}_bullseye-arm64.deb")
-source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${url}/releases/download/${pkgver//_/-}/${_appname}_${pkgver//_/-}_ubuntu-latest-amd64.deb")
-sha256sums_aarch64=('594248bf10f534ecd110018702269de7c3f182d42bdfc92952a97f95889ab3a5')
-sha256sums_x86_64=('11ea38fe6da972257caa522ecb7916773b22b98613679b499a381a92ee177c2e')
-package() {
+source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.deb::${url}/releases/download/${pkgver//_/-}/${_pkgname}_${pkgver//_/-}_bullseye-arm64.deb")
+source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${url}/releases/download/${pkgver//_/-}/${_pkgname}_${pkgver//_/-}_ubuntu-latest-amd64.deb")
+sha256sums_aarch64=('9831ed2ca84c2d36920f19f821c8586a0c407e30d7c16b61674b78f0997ea7bf')
+sha256sums_x86_64=('01de6b381b38829190ef684da106da0d45c343edc43cd35819d6190e5052eb47')
+build() {
     bsdtar -xf "${srcdir}/data.tar.xz"
-    install -Dm755 -d "${pkgdir}/opt" "${pkgdir}/usr"
-    cp -r "${srcdir}/usr/lib64/"* "${pkgdir}/opt"
-    cp -r "${srcdir}/usr/share" "${pkgdir}/usr"
-    install -Dm755 "${srcdir}/usr/bin/${_appname}" -t "${pkgdir}/opt/${_appname}"
-    sed "s|/usr/bin/${_appname}|/opt/${_appname}/${_appname}|g;s|Path=/usr/bin|Path=/opt/${_appname}|g" -i "${pkgdir}/usr/share/applications/${_appname}.desktop"
-    mv "${pkgdir}/usr/share/icons" "${pkgdir}/usr/share/pixmaps"
+    sed "s|/usr/bin/${_pkgname}|${pkgname%-bin}|g;s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g;s|/usr/bin|/opt/${pkgname%-bin}|g" \
+        -i "${srcdir}/usr/share/applications/${_pkgname}.desktop"
+    echo "/opt/${pkgname%-bin}/" >> "${srcdir}/${pkgname%-bin}.conf"
+    echo "/opt/${pkgname%-bin}/HCNetSDKCom/" >> "${srcdir}/${pkgname%-bin}.conf"
+}
+package() {
+    install -Dm755 "${srcdir}/usr/bin/${_pkgname}" -t "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/${pkgname%-bin}.conf" -t "${pkgdir}//etc/ld.so.conf.d"
+    cp -r "${srcdir}/usr/lib64/${_pkgname}/"* "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm755 -d "${pkgdir}/usr/bin"
+    ln -sf "/opt/${pkgname%-bin}/${_pkgname}" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/usr/share/applications/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    install -Dm644 "${srcdir}/usr/share/icons/${_pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
 }
\ No newline at end of file