mediainfo: update to 18.03.1

Closes: #12861 [via git-merge-pr]
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

srcpkgs/libmediainfo/template

@@ -1,36 +1,32 @@
 # Template file for 'libmediainfo'
 pkgname=libmediainfo
-version=17.12
+version=18.03.1
 revision=1
+wrksrc="MediaInfoLib"
+build_wrksrc="Project/GNU/Library"
+build_style=gnu-configure
+configure_args="--enable-shared --disable-static --with-libcurl --with-libmms"
+hostmakedepends="automake libtool pkg-config"
+makedepends="libcurl-devel libmms-devel libzen-devel"
 short_desc="Shared library for mediainfo"
-homepage="http://mediaarea.net/MediaInfo"
+homepage="https://mediaarea.net/MediaInfo"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="BSD"
-
+distfiles="https://mediaarea.net/download/source/libmediainfo/${version}/${pkgname}_${version}.tar.xz"
-distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.bz2"
+checksum=0243365f53299997bc04dfa065de9b3f1688b6eeb450a7f57e740504cd626fa0
-checksum=f6728556aa68bb66e89fb9b6c116f6242ce5769510d5d9664b3ad4098c07574d
-
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="libmms-devel libcurl-devel libzen-devel"
-configure_args="--enable-shared --disable-static --with-libcurl --with-libmms"
-create_wrksrc=yes
-build_wrksrc="MediaInfoLib/Project/GNU/Library"
 
 pre_configure() {
 	autoreconf -fi
 }
 
-do_install() {
+post_install() {
-	make DESTDIR=${DESTDIR} install
 	for i in MediaInfo MediaInfoDLL; do
-		install -dm 755 ${DESTDIR}/usr/include/$i
+		install -Dm644 ${wrksrc}/Source/$i/*.h -t ${DESTDIR}/usr/include/$i
-		install -m 644 ${wrksrc}/MediaInfoLib/Source/$i/*.h ${DESTDIR}/usr/include/$i
 	done
-	install -dm 755 ${DESTDIR}/usr/lib/pkgconfig
+
-	install -m 644 libmediainfo.pc ${DESTDIR}/usr/lib/pkgconfig
+	sed -i -e 's|Version: |Version: '$version'|g' libmediainfo.pc
-	sed -i -e 's|Version: |Version: '$version'|g' ${DESTDIR}/usr/lib/pkgconfig/libmediainfo.pc
+	vinstall libmediainfo.pc 644 usr/lib/pkgconfig
-	vlicense ${wrksrc}/MediaInfoLib/License.html
+	vlicense ${wrksrc}/License.html
 }
 
 libmediainfo-devel_package() {

srcpkgs/mediainfo/template

@@ -1,53 +1,58 @@
 # Template file for 'mediainfo'
 pkgname=mediainfo
-version=17.12
+version=18.03.1
 revision=1
+wrksrc="MediaInfo"
+hostmakedepends="automake libtool pkg-config"
+makedepends="libmediainfo-devel zlib-devel $(vopt_if GUI wxWidgets-devel)"
+depends="$(vopt_if GUI 'desktop-file-utils hicolor-icon-theme')"
 short_desc="Display technical and tag data for video and audio files"
-homepage="http://mediaarea.net/MediaInfo"
+homepage="https://mediaarea.net/MediaInfo"
 maintainer="Georg Schabel <gescha@posteo.de>"
+license="BSD"
+distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.xz"
+checksum=79664c356d4f09dc32105810aacf60923f6edcc6bec4836589962bc3375efcd6
+replaces="mediainfo-gui>=0"
+
 build_options="CLI GUI"
 build_options_default="CLI GUI"
 desc_option_CLI="Build CLI version"
 desc_option_GUI="Build GUI version"
-hostmakedepends="automake libtool pkg-config"
-makedepends="libmediainfo-devel zlib-devel $(vopt_if GUI wxWidgets-devel)"
-depends="$(vopt_if GUI 'desktop-file-utils hicolor-icon-theme')"
-create_wrksrc=yes
-_gnudir="MediaInfo/Project/GNU"
-_targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-replaces="mediainfo-gui>=0"
-license="BSD"
-distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.gz"
-checksum=b557c8bc91ac5f2a7297c2a2c2c1a6305d4ec5d89745130b831ceb992595ce8e
 
 do_configure() {
-	for d in $_targets; do
+	local targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-		cd $wrksrc/$_gnudir/$d
+
+	for d in $targets; do
+		cd $wrksrc/Project/GNU/$d
 		autoreconf -fi
 		./configure ${configure_args}
 	done
 }
 
 do_build() {
-	for d in $_targets; do
+	local targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-		cd $wrksrc/$_gnudir/$d
+
+	for d in $targets; do
+		cd $wrksrc/Project/GNU/$d
 		make ${makejobs}
 	done
 }
 
 do_install() {
-	for d in $_targets; do
+	local targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-		cd $wrksrc/$_gnudir/$d
+
+	for d in $targets; do
+		cd $wrksrc/Project/GNU/$d
 		make DESTDIR="${DESTDIR}" install
 	done
-	vlicense ${wrksrc}/MediaInfo/License.html
+	vlicense ${wrksrc}/License.html
 
 	if [ "$build_option_GUI" ]; then
-		vmkdir usr/share/icons/hicolor/scalable/apps
+		vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.svg 644 \
-		vinstall ${wrksrc}/MediaInfo/Source/Resource/Image/MediaInfo.svg 644 \
 			usr/share/icons/hicolor/scalable/apps mediainfo.svg
-		vinstall ${wrksrc}/MediaInfo/Source/Resource/Image/MediaInfo.png 644 \
+		vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.png 644 \
 			usr/share/pixmaps mediainfo-gui.png
-		vinstall ${wrksrc}/$_gnudir/GUI/mediainfo-gui.desktop 644 usr/share/applications
+		vinstall ${wrksrc}/Project/GNU/GUI/mediainfo-gui.desktop 644 \
+			usr/share/applications
 	fi
 }