summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD29
-rw-r--r--codecid.patch22
-rw-r--r--project.patch21
-rw-r--r--qml.patch55
5 files changed, 125 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4e630abeb3d..a13027f9b06 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qtcam-git
pkgdesc = a free, Open Source Linux Webcamera Software with more than 10 image control settings
- pkgver = db79dca9
+ pkgver = c4ce3eb8
pkgrel = 1
url = http://www.e-consystems.com/opensource-linux-webcam-software-application.asp
arch = i686
@@ -11,7 +11,13 @@ pkgbase = qtcam-git
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
pkgname = qtcam-git
diff --git a/PKGBUILD b/PKGBUILD
index 282ea17d3ab..2824c6de004 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,33 @@
# Contributor: Piotr Rogoza <piotr dot r dot public at gmail dot com>
pkgname=qtcam-git
-pkgver=db79dca9
+pkgver=c4ce3eb8
pkgrel=1
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')
-groups=()
depends=(qt5-declarative ffmpeg)
if [[ $CARCH = x86_64 ]]; then
depends+=(gcc-libs-multilib)
fi
makedepends=(git qtchooser)
-source=('git://github.com/econsysqtcam/qtcam.git')
+source=('git://github.com/econsysqtcam/qtcam.git'
+codecid.patch
+qml.patch
+project.patch
+)
_gitname='qtcam'
-md5sums=(SKIP)
-
+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(){
if [ -d "$srcdir"/$_gitname ]; then
cd "$srcdir"/$_gitname
@@ -28,14 +39,14 @@ build(){
cd "$srcdir"/$_gitname/src
msg2 "Starting make"
- qmake
+ qmake
make
}
package(){
cd "$srcdir"/$_gitname/src
msg2 "Starting make install"
make INSTALL_ROOT="$pkgdir" install
- install -dm755 "$pkgdir"/usr/bin
- cd "$pkgdir"/usr/bin
- ln -s /opt/Qtcam/bin/Qtcam
+ install -dm755 "$pkgdir"/usr/share/qtcam/qml
+ mv "$pkgdir"/usr/bin/qtcam/* "$pkgdir"/usr/share/qtcam/qml/
+ rmdir "$pkgdir"/usr/bin/qtcam
}
diff --git a/codecid.patch b/codecid.patch
new file mode 100644
index 00000000000..d1943ce89c8
--- /dev/null
+++ b/codecid.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 00000000000..b6d426fb00b
--- /dev/null
+++ b/project.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 00000000000..ccd0354a6f3
--- /dev/null
+++ b/qml.patch
@@ -0,0 +1,55 @@
+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();