[arch-commits] Commit in guvcview/trunk (2 files)

Fri Dec 28 20:53:14 UTC 2018

Date: Friday, December 28, 2018 @ 20:53:13
  Author: bgyorgy
Revision: 418777

upgpkg: guvcview 2.0.6-2

Avoid conflict between GTK+/Qt interfaces, fix AppStream metadata

Added:
  guvcview/trunk/0001-Update-AppStream-metadata-to-a-newer-version.patch
Modified:
  guvcview/trunk/PKGBUILD

---------------------------------------------------------+
 0001-Update-AppStream-metadata-to-a-newer-version.patch |   71 ++++++++++++++
 PKGBUILD                                                |   44 ++++++--
 2 files changed, 106 insertions(+), 9 deletions(-)

Added: 0001-Update-AppStream-metadata-to-a-newer-version.patch
===================================================================

--- 0001-Update-AppStream-metadata-to-a-newer-version.patch	                        (rev 0)
+++ 0001-Update-AppStream-metadata-to-a-newer-version.patch	2018-12-28 20:53:13 UTC (rev 418777)
@@ -0,0 +1,71 @@
+From ee2a783223fc9be7135505535f67ade84d984940 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Fri, 28 Dec 2018 21:35:06 +0100
+Subject: [PATCH] Update AppStream metadata to a newer version
+
+---
+ data/Makefile.am                |  2 +-
+ data/guvcview.appdata.xml.in.in | 29 ++++++++++++++++++++---------
+ 2 files changed, 21 insertions(+), 10 deletions(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 22055f0..ad14d10 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -28,7 +28,7 @@ desktop_DATA = $(DESKTOP_FILES)
+ APPDATA_IN_FILES= guvcview.appdata.xml.in
+ APPDATA_FILES= $(APPDATA_IN_FILES:.xml.in=.xml)
+ 
+-appdatadir = $(datadir)/appdata
++appdatadir = $(datadir)/metainfo
+ appdata_DATA = $(APPDATA_FILES)
+ 
+ endif
+diff --git a/data/guvcview.appdata.xml.in.in b/data/guvcview.appdata.xml.in.in
+index 61ba8c3..de934f7 100644
+--- a/data/guvcview.appdata.xml.in.in
++++ b/data/guvcview.appdata.xml.in.in
+@@ -1,7 +1,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2014 Paulo Assis <pj.assis at gmail.com> -->
+-<application>
+- <id type="desktop">guvcview.desktop</id>
++<component type="desktop-application">
++ <id>net.sourceforge.guvcview</id>
++ <launchable type="desktop-id">guvcview.desktop</launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <name>Simple UVC Viewer</name>
+@@ -16,12 +17,22 @@
+      that is compatible with any other v4l2 app.</_p>
+  </description>
+  <screenshots>
+-  <screenshot>https://sourceforge.net/p/guvcview/screenshot/guvcview_image_tab.png</screenshot>
+-  <screenshot>https://sourceforge.net/p/guvcview/screenshot/guvcview_h264_tab.png</screenshot>
+-  <screenshot>https://sourceforge.net/p/guvcview/screenshot/guvcview_video_tab.png</screenshot>
+-  <screenshot>https://sourceforge.net/p/guvcview/screenshot/guvcview_audio_tab.png</screenshot>
+-  <screenshot>https://a.fsdn.com/con/app/proj/guvcview/screenshots/guvcview_video_preview.png</screenshot>
++  <screenshot>
++   <image>https://sourceforge.net/p/guvcview/screenshot/guvcview_image_tab.png</image>
++  </screenshot>
++  <screenshot>
++   <image>https://sourceforge.net/p/guvcview/screenshot/guvcview_h264_tab.png</image>
++  </screenshot>
++  <screenshot>
++   <image>https://sourceforge.net/p/guvcview/screenshot/guvcview_video_tab.png</image>
++  </screenshot>
++  <screenshot>
++   <image>https://sourceforge.net/p/guvcview/screenshot/guvcview_audio_tab.png</image>
++  </screenshot>
++  <screenshot>
++   <image>https://a.fsdn.com/con/app/proj/guvcview/screenshots/guvcview_video_preview.png</image>
++  </screenshot>
+  </screenshots>
+  <url type="homepage">http://guvcview.sourceforge.net/</url>
+- <updatecontact>assisp at gmail.com</updatecontact>
+-</application>
++ <update_contact>assisp at gmail.com</update_contact>
++</component>
+-- 
+2.20.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-28 20:52:54 UTC (rev 418776)
+++ PKGBUILD	2018-12-28 20:53:13 UTC (rev 418777)
@@ -3,9 +3,9 @@
 # Contributor: Maxwell Pray a.k.a. Synthead <synthead at gmail.com>
 
 pkgbase=guvcview
-pkgname=(guvcview guvcview-qt)
+pkgname=(guvcview guvcview-common guvcview-qt)
 pkgver=2.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple interface for capturing and viewing video from v4l2 devices"
 arch=('x86_64')
 url="http://guvcview.sourceforge.net/"
@@ -12,11 +12,19 @@
 license=('GPL3')
 depends=('ffmpeg' 'gsl' 'gtk3' 'qt5-base' 'portaudio')
 makedepends=('intltool')
-source=("https://downloads.sourceforge.net/$pkgbase/$pkgbase-src-$pkgver.tar.gz")
-sha256sums=('95381cef5ee139e15f90b79d1425cc22bbaae43f87452cdce6674636aff37e85')
+options=('!emptydirs')
+source=("https://downloads.sourceforge.net/$pkgbase/$pkgbase-src-$pkgver.tar.gz"
+        0001-Update-AppStream-metadata-to-a-newer-version.patch)
+sha256sums=('95381cef5ee139e15f90b79d1425cc22bbaae43f87452cdce6674636aff37e85'
+            'd9c65a9bf53eb28c48f9a9126035f5ebe520923124eae507d1cb2994e2a0d08f')
 
 prepare() {
   cd $pkgbase-src-$pkgver
+
+  # Update AppStream metadata to a newer version
+  patch -Np1 -i ../0001-Update-AppStream-metadata-to-a-newer-version.patch
+
+  autoreconf -fi
   cp -a ../$pkgbase{,-qt}-src-$pkgver
 }
 
@@ -34,19 +42,37 @@
   make
 }
 
+package_guvcview-common() {
+  pkgdesc="Common files for guvcview"
+  depends=('ffmpeg' 'gsl' 'libusb' 'portaudio')
+
+  cd $pkgbase-src-$pkgver
+  make DESTDIR="$pkgdir" install
+  make -C guvcview DESTDIR="$pkgdir" uninstall
+  make -C data DESTDIR="$pkgdir" uninstall-man1 uninstall-appdataDATA uninstall-desktopDATA
+}
+
 package_guvcview() {
   pkgdesc="Simple GTK+ interface for capturing and viewing video from v4l2 devices"
-  depends=('ffmpeg' 'gsl' 'gtk3' 'portaudio')
+  depends=('guvcview-common' 'gtk3')
 
   cd $pkgbase-src-$pkgver
-  make DESTDIR="$pkgdir" install
+  make -C guvcview DESTDIR="$pkgdir" install
+  make -C data DESTDIR="$pkgdir" install-man1 install-appdataDATA install-desktopDATA
 }
 
 package_guvcview-qt() {
   pkgdesc="Simple Qt interface for capturing and viewing video from v4l2 devices"
-  depends=('ffmpeg' 'gsl' 'qt5-base' 'portaudio')
-  conflicts=('guvcview')
+  depends=('guvcview-common' 'qt5-base')
 
   cd $pkgbase-qt-src-$pkgver
-  make DESTDIR="$pkgdir" install
+  make -C guvcview DESTDIR="$pkgdir" install
+  make -C data DESTDIR="$pkgdir" install-man1 install-appdataDATA install-desktopDATA
+  mv "$pkgdir"/usr/bin/guvcview{,-qt}
+  mv "$pkgdir"/usr/share/man/man1/guvcview{,-qt}.1
+  mv "$pkgdir"/usr/share/applications/guvcview{,-qt}.desktop
+  sed -i 's/Exec=guvcview/Exec=guvcview-qt/' "$pkgdir"/usr/share/applications/guvcview-qt.desktop
+  mv "$pkgdir"/usr/share/metainfo/guvcview{,-qt}.appdata.xml
+  sed -i 's/net.sourceforge.guvcview/net.sourceforge.guvcview-qt/
+          s/guvcview.desktop/guvcview-qt.desktop/' "$pkgdir"/usr/share/metainfo/guvcview-qt.appdata.xml
 }

