summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorImNtReal2016-06-14 11:34:34 -0400
committerImNtReal2016-06-14 11:34:34 -0400
commite1867822e44d6e81c384a0c780bac3bcad7aee48 (patch)
tree4edaa4b0de781701fbb14932cc13e5a566dd2bb8
parent4531f7f46b7ebb2885aee22cb370ebde6a3408ef (diff)
downloadaur-e1867822e44d6e81c384a0c780bac3bcad7aee48.tar.gz
switched to alexzk1 fork
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD62
-rw-r--r--codecid.patch22
-rw-r--r--project.patch21
-rw-r--r--qml.patch55
-rw-r--r--qtcam.desktop10
6 files changed, 25 insertions, 161 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d8e8b416a1f..d2c46651c6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Feb 26 20:33:26 UTC 2016
+# Tue Jun 14 15:34:12 UTC 2016
pkgbase = qtcam-git
- pkgdesc = A free, Open Source Linux Webcamera Software with more than 10 image control settings
- pkgver = r10.34326dc8
+ pkgdesc = A free, Open Source Linux Webcamera Software with more than 10 image control settings - alexzk1 fork
+ pkgver = r24.42b300c
pkgrel = 1
url = http://www.e-consystems.com/opensource-linux-webcam-software-application.asp
arch = i686
@@ -13,16 +13,8 @@ pkgbase = qtcam-git
depends = qt5-declarative
depends = ffmpeg
depends = libusb
- source = git://github.com/econsysqtcam/qtcam.git
- source = codecid.patch
- source = qml.patch
- source = project.patch
- source = qtcam.desktop
+ source = git://github.com/alexzk1/qtcam.git
sha256sums = SKIP
- sha256sums = b980cc36f0af3aa111eada5f311a689c480cde8d6e9cd19ba9d121fab9d3c420
- sha256sums = be3a4790936b2f1d4d0015c565a69428a99c2e455f1e1febc694b039370efddc
- sha256sums = 82293ff09cd283b1458c16e0c60ab7ee77d2691d662adedee0b29a90079ccf3c
- sha256sums = e185af699a218115b5b2b3223d6989e5abcb56293f3e19c4e57308a460c86834
pkgname = qtcam-git
diff --git a/PKGBUILD b/PKGBUILD
index 83aec21c794..77e4ab3de43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,38 @@
-# Maintainer: Piotr Rogoza <piotr dot r dot public at gmail dot com>
+# Maintainer: Jameson Pugh <imntreal@gmail.com>
+# Contributor: Piotr Rogoza <piotr dot r dot public at gmail dot com>
pkgname=qtcam-git
-pkgver=r10.34326dc8
+pkgver=r24.42b300c
pkgrel=1
-pkgdesc='A free, Open Source Linux Webcamera Software with more than 10 image control settings'
+pkgdesc='A free, Open Source Linux Webcamera Software with more than 10 image control settings - alexzk1 fork'
arch=('i686' 'x86_64')
url='http://www.e-consystems.com/opensource-linux-webcam-software-application.asp'
license=('GPL')
-depends=(
-qt5-declarative
-ffmpeg
-libusb
-)
+depends=('qt5-declarative' 'ffmpeg' 'libusb')
if [[ $CARCH = x86_64 ]]; then
- depends+=(gcc-libs-multilib)
+ depends+=('gcc-libs-multilib')
fi
-makedepends=(
-git
-qtchooser
-)
-source=(
-'git://github.com/econsysqtcam/qtcam.git'
-codecid.patch
-qml.patch
-project.patch
-qtcam.desktop
-)
-sha256sums=('SKIP'
- 'b980cc36f0af3aa111eada5f311a689c480cde8d6e9cd19ba9d121fab9d3c420'
- 'be3a4790936b2f1d4d0015c565a69428a99c2e455f1e1febc694b039370efddc'
- '82293ff09cd283b1458c16e0c60ab7ee77d2691d662adedee0b29a90079ccf3c'
- 'e185af699a218115b5b2b3223d6989e5abcb56293f3e19c4e57308a460c86834')
+makedepends=('git' 'qtchooser')
+source=('git://github.com/alexzk1/qtcam.git')
+sha256sums=('SKIP')
_gitname='qtcam'
-prepare() {
- cd $_gitname
- patch -p1 -i "$srcdir/codecid.patch"
- patch -p1 -i "$srcdir/qml.patch"
- patch -p1 -i "$srcdir/project.patch"
-}
+
pkgver() {
- cd $_gitname
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ cd "${_gitname}"
+ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
}
+
build() {
- cd $_gitname/src
+ cd "${srcdir}/${_gitname}/src"
qmake
make
}
package() {
- cd $_gitname/src
- 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
+ cd "${srcdir}/${_gitname}/src"
+ #make INSTALL_ROOT="${pkgdir}" install
+ install -Dm644 "${srcdir}/${_gitname}/arch_linux/qtcam.desktop" "${pkgdir}/usr/share/applications/qtcam.desktop"
+ install -Dm644 "${srcdir}/${_gitname}/src/qml/qtcam/icon/images/icon.jpg" "${pkgdir}/usr/share/pixmaps/qtcam.jpg"
+ install -Dm755 "${srcdir}/${_gitname}/src/qtcam" "${pkgdir}/usr/bin/qtcam"
}
+
+# vim: set ts=2 sw=2 ft=sh noet:
diff --git a/codecid.patch b/codecid.patch
deleted file mode 100644
index e04a6e93ff3..00000000000
--- a/codecid.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/videoencoder.h b/src/videoencoder.h
-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"
diff --git a/project.patch b/project.patch
deleted file mode 100644
index b6d426fb00b..00000000000
--- a/project.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/qtcam.pro b/src/qtcam.pro
-index 1be34797..21bf7416 100644
---- a/src/qtcam.pro
-+++ b/src/qtcam.pro
-@@ -1,6 +1,6 @@
- # Add more folders to ship with the application, here
- folder_01.source = qml/qtcam
--folder_01.target = qml
-+folder_01.target = .
- DEPLOYMENTFOLDERS = folder_01
-
- QT += widgets
-@@ -32,7 +32,7 @@ SOURCES += main.cpp \
-
- # Installation path
- # target.path =
--target.path = /usr/
-+target.path = /usr/bin
-
- # Please do not modify the following two lines. Required for deployment.
- include(qtquick2applicationviewer/qtquick2applicationviewer.pri)
diff --git a/qml.patch b/qml.patch
deleted file mode 100644
index ccd0354a6f3..00000000000
--- a/qml.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/src/about.cpp b/src/about.cpp
-index fd797c3b..f1093e98 100644
---- a/src/about.cpp
-+++ b/src/about.cpp
-@@ -22,7 +22,7 @@
-
- AboutPage::AboutPage()
- {
-- version = new QSettings("/usr/share/qml/qtcam/about/release.ini",QSettings::IniFormat);
-+ version = new QSettings("/usr/share/qtcam/qml/about/release.ini",QSettings::IniFormat);
- version->beginGroup("release");
- appName = version->value("applicationname").toString();
- appVerNumber = version->value("version").toString();
-@@ -45,7 +45,7 @@ QString AboutPage::getApplicationVersionNumber() {
- }
-
- QByteArray AboutPage::getCopyRight() {
-- copyRightFile = new QFile("/usr/share/qml/qtcam/about/copyright.txt");
-+ copyRightFile = new QFile("/usr/share/qtcam/qml/about/copyright.txt");
- if(copyRightFile->open(QIODevice::ReadOnly)){
- copyRight = copyRightFile->readAll();
- copyRightFile->close();
-diff --git a/src/logger.cpp b/src/logger.cpp
-index 7b807212..1ffba582 100644
---- a/src/logger.cpp
-+++ b/src/logger.cpp
-@@ -69,7 +69,7 @@ void logger::logFileCreation() {
- dt += "\n********************************************************************************";
- ts << dt << "\n" << flush;
- }
-- QSettings *releaseSettings = new QSettings("/usr/share/qml/qtcam/about/release.ini",QSettings::IniFormat);
-+ QSettings *releaseSettings = new QSettings("/usr/share/qtcam/qml/about/release.ini",QSettings::IniFormat);
- releaseSettings->beginGroup("release");
- DEBUG = releaseSettings->value("logDebugEnable").toBool();
- WARNING = releaseSettings->value("logWarningEnable").toBool();
-diff --git a/src/main.cpp b/src/main.cpp
-index 1f4617ea..1fc9d58a 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -92,13 +92,13 @@ int main(int argc, char *argv[])
- viewer.rootContext()->setContextProperty("SystemPictureFolder",QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).first());
- viewer.rootContext()->setContextProperty("SystemVideoFolder",QStandardPaths::standardLocations(QStandardPaths::MoviesLocation).first());
-
-- viewer.setMainQmlFile(QStringLiteral("/usr/share/qml/qtcam/videocapturefilter_QML/videocapturefilter_qml.qml"));
-+ viewer.setMainQmlFile(QStringLiteral("/usr/share/qtcam/qml/videocapturefilter_QML/videocapturefilter_qml.qml"));
- QObject *rootObject = dynamic_cast<QObject*>(viewer.rootObject());
-
- QObject::connect(rootObject,SIGNAL(stopCamPreview()),rootObject,SLOT(triggerModeCapture()));
-
- //Setting the Window ICON
-- QIcon icon("/usr/share/qml/qtcam/icon/images/icon.jpg");
-+ QIcon icon("/usr/share/qtcam/qml/icon/images/icon.jpg");
- viewer.setIcon(icon);
- viewer.setTitle("Qtcam");
- viewer.showMaximized();
diff --git a/qtcam.desktop b/qtcam.desktop
deleted file mode 100644
index e536de27a81..00000000000
--- a/qtcam.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[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;