summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Rogoża2016-01-21 22:39:45 +0100
committerPiotr Rogoża2016-01-21 22:39:45 +0100
commitcfec5bd51e6f3ed9e604b67ca2f33094425e7264 (patch)
tree0996a4888d77e84882f3a80b901634f8b3ddaea3
parentfe6e142e9a5e3e8488feb036bc7fd081483d2c2c (diff)
downloadaur-cfec5bd51e6f3ed9e604b67ca2f33094425e7264.tar.gz
Fixed file format for codecid.patch
Added desktop file and icon. Added missing libusb to depends. Reformat PKGBUILD.
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD40
-rw-r--r--codecid.patch34
-rw-r--r--qtcam.desktop10
4 files changed, 64 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a13027f9b06..4a565d19d59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,28 @@
+# Generated by mksrcinfo v8
+# Thu Jan 21 21:37:50 UTC 2016
pkgbase = qtcam-git
- pkgdesc = a free, Open Source Linux Webcamera Software with more than 10 image control settings
- pkgver = c4ce3eb8
- pkgrel = 1
+ pkgdesc = A free, Open Source Linux Webcamera Software with more than 10 image control settings
+ pkgver = 34326dc8
+ pkgrel = 2
url = http://www.e-consystems.com/opensource-linux-webcam-software-application.asp
arch = i686
arch = x86_64
license = GPL
makedepends = git
makedepends = qtchooser
+ makedepends = libusb
depends = qt5-declarative
depends = ffmpeg
source = git://github.com/econsysqtcam/qtcam.git
source = codecid.patch
source = qml.patch
source = project.patch
- md5sums = SKIP
- md5sums = 5e4a675763c997834e417011b37d7280
- md5sums = eb9f2e07d33c885888865ed80266d593
- md5sums = 8fc48b5c9f69a62a43d638df2195a02a
+ source = qtcam.desktop
+ sha256sums = SKIP
+ sha256sums = b980cc36f0af3aa111eada5f311a689c480cde8d6e9cd19ba9d121fab9d3c420
+ sha256sums = be3a4790936b2f1d4d0015c565a69428a99c2e455f1e1febc694b039370efddc
+ sha256sums = 82293ff09cd283b1458c16e0c60ab7ee77d2691d662adedee0b29a90079ccf3c
+ sha256sums = e185af699a218115b5b2b3223d6989e5abcb56293f3e19c4e57308a460c86834
pkgname = qtcam-git
diff --git a/PKGBUILD b/PKGBUILD
index 2824c6de004..8288fa0979d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,62 @@
# Maintainer: Piotr Rogoza <piotr dot r dot public at gmail dot com>
-# Contributor: Piotr Rogoza <piotr dot r dot public at gmail dot com>
pkgname=qtcam-git
-pkgver=c4ce3eb8
-pkgrel=1
-pkgdesc='a free, Open Source Linux Webcamera Software with more than 10 image control settings'
+pkgver=34326dc8
+pkgrel=2
+pkgdesc='A free, Open Source Linux Webcamera Software with more than 10 image control settings'
arch=('i686' 'x86_64')
url='http://www.e-consystems.com/opensource-linux-webcam-software-application.asp'
license=('GPL')
-depends=(qt5-declarative ffmpeg)
+depends=(
+qt5-declarative
+ffmpeg
+libusb
+)
if [[ $CARCH = x86_64 ]]; then
depends+=(gcc-libs-multilib)
fi
-makedepends=(git qtchooser)
-source=('git://github.com/econsysqtcam/qtcam.git'
+makedepends=(
+git
+qtchooser
+)
+source=(
+'git://github.com/econsysqtcam/qtcam.git'
codecid.patch
qml.patch
project.patch
+qtcam.desktop
)
+sha256sums=('SKIP'
+ 'b980cc36f0af3aa111eada5f311a689c480cde8d6e9cd19ba9d121fab9d3c420'
+ 'be3a4790936b2f1d4d0015c565a69428a99c2e455f1e1febc694b039370efddc'
+ '82293ff09cd283b1458c16e0c60ab7ee77d2691d662adedee0b29a90079ccf3c'
+ 'e185af699a218115b5b2b3223d6989e5abcb56293f3e19c4e57308a460c86834')
_gitname='qtcam'
-md5sums=('SKIP'
- '5e4a675763c997834e417011b37d7280'
- 'eb9f2e07d33c885888865ed80266d593'
- '8fc48b5c9f69a62a43d638df2195a02a')
prepare() {
cd "$srcdir"/$_gitname
patch -p1 -i "$srcdir"/codecid.patch
patch -p1 -i "$srcdir"/qml.patch
patch -p1 -i "$srcdir"/project.patch
}
-pkgver(){
+pkgver() {
if [ -d "$srcdir"/$_gitname ]; then
cd "$srcdir"/$_gitname
git describe --always | sed 's|-|.|g'
fi
}
-build(){
+build() {
cd "$srcdir"/$_gitname/src
msg2 "Starting make"
-
qmake
make
}
-package(){
+package() {
cd "$srcdir"/$_gitname/src
msg2 "Starting make install"
make INSTALL_ROOT="$pkgdir" install
install -dm755 "$pkgdir"/usr/share/qtcam/qml
+ install -Dm644 "$srcdir"/qtcam.desktop "$pkgdir"/usr/share/applications/qtcam.desktop
+ install -Dm644 "$srcdir"/qtcam/src/qtcam/icon/images/icon.jpg "$pkgdir"/usr/share/pixmaps/qtcam.jpg
mv "$pkgdir"/usr/bin/qtcam/* "$pkgdir"/usr/share/qtcam/qml/
rmdir "$pkgdir"/usr/bin/qtcam
}
diff --git a/codecid.patch b/codecid.patch
index d1943ce89c8..e04a6e93ff3 100644
--- a/codecid.patch
+++ b/codecid.patch
@@ -3,20 +3,20 @@ index b04238b7..211add95 100644
--- a/src/videoencoder.h
+++ b/src/videoencoder.h
@@ -30,14 +30,14 @@
- LIBAVCODEC_VERSION_MINOR >= minor))
-
-
--//#if !LIBAVCODEC_VER_AT_LEAST(54,25)
-+#if !LIBAVCODEC_VER_AT_LEAST(54,25)
- // #define AV_CODEC_ID_NONE CODEC_ID_NONE
- // #define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG
- // #define AV_CODEC_ID_RAWVIDEO CODEC_ID_RAWVIDEO
- // #define AV_CODEC_ID_H264 CODEC_ID_H264
- // #define AV_CODEC_ID_VP8 CODEC_ID_VP8
--// #define AVCodecID CodecID
--//#endif
-+ #define AVCodecID CodecID
-+#endif
-
- extern "C" {
- #include "libavcodec/avcodec.h"
+ LIBAVCODEC_VERSION_MINOR >= minor))
+
+
+-//#if !LIBAVCODEC_VER_AT_LEAST(54,25)
++#if !LIBAVCODEC_VER_AT_LEAST(54,25)
+ // #define AV_CODEC_ID_NONE CODEC_ID_NONE
+ // #define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG
+ // #define AV_CODEC_ID_RAWVIDEO CODEC_ID_RAWVIDEO
+ // #define AV_CODEC_ID_H264 CODEC_ID_H264
+ // #define AV_CODEC_ID_VP8 CODEC_ID_VP8
+-// #define AVCodecID CodecID
+-//#endif
++ #define AVCodecID CodecID
++#endif
+
+ extern "C" {
+ #include "libavcodec/avcodec.h"
diff --git a/qtcam.desktop b/qtcam.desktop
new file mode 100644
index 00000000000..e536de27a81
--- /dev/null
+++ b/qtcam.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Qtcam
+Comment=Open Source Linux Webcamera Software
+Exec=Qtcam
+Icon=/usr/share/pixmaps/qtcam.jpg
+Terminal=false
+StartupNotify=false
+Categories=Application;