main/v4l-utils: fix qt application

We want it in a subpackage and we need proper icon and desktop file

3 files changed, 64 insertions, 7 deletions

diff --git a/main/v4l-utils/APKBUILD b/main/v4l-utils/APKBUILD
index 0bb818ac0f..38eeaa3c2c 100644
--- a/main/v4l-utils/APKBUILD
+++ b/main/v4l-utils/APKBUILD
@@ -2,17 +2,18 @@
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=v4l-utils
 pkgver=0.8.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 url="http://freshmeat.net/projects/libv4l"
 arch="all"
 license="LGPL"
 depends=""
-depends_dev="qt-dev"
-makedepends=""
+makedepends="qt-dev"
 install=""
-subpackages="$pkgname-dev"
-source="http://linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2"
+subpackages="$pkgname-dev qv4l2"
+source="http://linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2
+	qv4l2.svg
+	qv4l2.desktop"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
@@ -34,7 +35,20 @@ build() {
 
 package() {
         cd "$_builddir"
-        make PREFIX="/usr" DESTDIR="$pkgdir" install || return 1
+        make -j1 PREFIX="/usr" DESTDIR="$pkgdir" install || return 1
+	install -Dm644 "$srcdir"/qv4l2.desktop \
+		"$pkgdir"/usr/share/applications/qv4l2.desktop || return 1
+	install -Dm644 "$srcdir"/qv4l2.svg \
+		"$pkgdir"/usr/share/icons/hicolor/scalable/apps/qv4l2.svg
 }
 
-md5sums="f25ad639717d7411a58f10a9e378d7db  v4l-utils-0.8.3.tar.bz2"
+qv4l2() {
+	pkgdesc="QT v4l2 test control and streaming test application"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/qv4l2 "$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/share "$subpkgdir"/usr/ || return 1
+}
+
+md5sums="f25ad639717d7411a58f10a9e378d7db  v4l-utils-0.8.3.tar.bz2
+75ef594ddfe48e48df99c96c2af6b51e  qv4l2.svg
+b2e51f9663cee1c38a1d99d76a6b529f  qv4l2.desktop"
diff --git a/main/v4l-utils/qv4l2.desktop b/main/v4l-utils/qv4l2.desktop
new file mode 100644
index 0000000000..55e369c7c5
--- /dev/null
+++ b/main/v4l-utils/qv4l2.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=QT V4L2 test Utility
+Name[pt]=Utilitário de teste V4L2
+Comment=Allow testing Video4Linux devices
+Comment[pt]=Permite testar dispositivos Video4Linux
+Exec=qv4l2
+Icon=qv4l2
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;
+
diff --git a/main/v4l-utils/qv4l2.svg b/main/v4l-utils/qv4l2.svg
new file mode 100644
index 0000000000..3d4f375cc2
--- /dev/null
+++ b/main/v4l-utils/qv4l2.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:version="0.47 r22583" version="1.1" id="svg2839" height="297mm" width="210mm" sodipodi:docname="Novo documento 3">
+  <defs id="defs2841">
+    <linearGradient id="linearGradient2963">
+      <stop style="stop-color: rgb(255, 236, 187); stop-opacity: 1;" offset="0" id="stop2965"/>
+      <stop id="stop2971" offset="1" style="stop-color: rgb(0, 0, 0); stop-opacity: 0.498039;"/>
+    </linearGradient>
+    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" id="perspective2847"/>
+    <inkscape:perspective id="perspective2935" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient2963" id="linearGradient2969" x1="-719.14288" y1="494.69958" x2="-324.21902" y2="968.98529" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0512, 0, 0, 1.05137, 651.058, -25.2444)"/>
+    <inkscape:perspective id="perspective2992" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.7" inkscape:cx="376.9721" inkscape:cy="468.42546" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1513" inkscape:window-height="1044" inkscape:window-x="1941" inkscape:window-y="0" inkscape:window-maximized="0"/>
+  <metadata id="metadata2844">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Camada 1" inkscape:groupmode="layer" id="layer1">
+    <rect style="fill: rgb(173, 160, 127); fill-opacity: 1;" id="rect2959" width="498.57132" height="402.52496" x="101.42867" y="345.21906" ry="15.848869"/>
+    <rect style="fill: rgb(214, 207, 189); fill-opacity: 1; fill-rule: evenodd; stroke: rgb(0, 0, 0); stroke-width: 1.09651px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1;" id="rect2955" width="366.37466" height="268.80539" x="172.03215" y="409.8259" ry="24.860613"/>
+    <path style="fill: url(&quot;#linearGradient2969&quot;) rgb(0, 0, 0); fill-opacity: 1;" d="m 111.92284,745.80915 c -1.7443,-0.70488 -4.61634,-3.11878 -6.38231,-5.3642 l -3.21086,-4.08259 0,-189.14299 c 0,-136.34795 0.46823,-190.05871 1.67748,-192.42365 0.92263,-1.80438 3.11889,-4.44845 4.8806,-5.87571 3.00442,-2.43405 17.98923,-2.5971 241.57759,-2.62843 l 238.37448,-0.0334 4.90427,4.38251 4.90429,4.3825 0.39257,189.41161 c 0.43575,210.24489 1.09242,196.30432 -9.4544,200.71175 -4.34407,1.81535 -40.20923,2.12038 -239.80015,2.0394 -129.08065,-0.0523 -236.11926,-0.67193 -237.86356,-1.37681 z m 413.94314,-69.49552 c 4.39946,-2.22093 7.85143,-5.43895 10.06966,-9.38725 l 3.37535,-6.00784 -0.36571,-118.16973 c -0.36124,-116.72035 -0.4037,-118.22058 -3.46195,-122.31682 -4.69144,-6.28374 -10.15101,-9.79936 -17.39001,-11.19809 -8.54594,-1.65125 -316.90144,-1.65125 -325.4474,0 -7.68,1.48394 -13.16379,5.20817 -17.88452,12.146 l -3.40519,5.00442 0.40173,119.03503 c 0.39878,118.15286 0.42505,119.06645 3.54637,123.27494 1.72955,2.33195 5.7842,5.74954 9.01033,7.59462 l 5.8657,3.35471 164.49565,0.0248 164.49566,0.0246 6.69433,-3.3794 z" id="path2961"/>
+    <rect style="fill: rgb(25, 20, 8); fill-opacity: 1;" id="rect2980" width="63.072273" height="39.050926" x="499.38467" y="744.74005" ry="0"/>
+    <rect style="fill: rgb(25, 20, 8); fill-opacity: 1;" id="rect2980-1" width="63.072273" height="39.050926" x="130.56888" y="744.74005" ry="0"/>
+  </g>
+</svg>
\ No newline at end of file