summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateusz Gozdek2020-05-28 10:03:11 +0200
committerMateusz Gozdek2020-05-28 10:03:11 +0200
commit9b90503ae29251f3028b9032a5fca54964bc6833 (patch)
tree088e0b972f5beb9f58277fd4fa7cc7d14aec493c
parent68329e510a9a252f78f78bd1a84e403d7700e42f (diff)
downloadaur-9b90503ae29251f3028b9032a5fca54964bc6833.tar.gz
Update to first official GitHub release 1.1
Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>
-rw-r--r--.SRCINFO9
-rw-r--r--0001-Use-shared-version-of-libjpeg-turbo.patch48
-rw-r--r--PKGBUILD18
3 files changed, 34 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 03d9cf84583..f57d1a08fdf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
pkgbase = droidcam
pkgdesc = A tool for using your android device as a wireless/usb webcam
- pkgver = 6.7.5.6c7b273
+ pkgver = 1.1
pkgrel = 1
+ epoch = 1
url = https://www.dev47apps.com/droidcam/linuxx
arch = x86_64
license = GPL
@@ -9,10 +10,10 @@ pkgbase = droidcam
optdepends = gtk2: use GUI version in addition to CLI interface
source = droidcam.desktop
source = 0001-Use-shared-version-of-libjpeg-turbo.patch
- source = droidcam.zip::https://github.com/aramg/droidcam/archive/6c7b273bd20b23a5b1074d5af30f0a13ce3d6065.zip
+ source = droidcam.zip::https://github.com/aramg/droidcam/archive/v1.1.zip
sha512sums = 72d21aa2d7eecc9bb070aaf7059a671246feb22f9c39b934a5463a4839f9347050de00754e5031dbc44f78eb2731f58f0cd2fcf781bc241f6fbd1abb4308b7ee
- sha512sums = 238f41f5a3188226246e6446b3f8eceaf36472c0fb51dac995d535cf66cab27d9c43612fdfd553c57a398804db6ce817ecfaf2360ffbb53a404a05b6ac41a6bb
- sha512sums = 0bc9d1223fe598f90cb537f9978bf35410248b366e0e3a9ea4815fbcb5a99e8fed8fe00833dacb678f3f125f7614e011276ae3835f91e50f78da87131bd381b8
+ sha512sums = 4ae0849efb8f9183cae75d0ccc1459afe186de6479d47d4634c78c43ab9d92e46bf33d2f68e93134c4d67569cd5421d408013371ad2d5c33d60c0af5de284deb
+ sha512sums = f02a76eb5323b62db9a54107a42e2150e2dfc27ab0acb5600ec0ed09e0512c2b7a21dd2105125d4f4d482348c807bf87f2d96131ce5b46e89d60a3b6f67d3a53
pkgname = droidcam
diff --git a/0001-Use-shared-version-of-libjpeg-turbo.patch b/0001-Use-shared-version-of-libjpeg-turbo.patch
index 9e6bd908340..97d892d9993 100644
--- a/0001-Use-shared-version-of-libjpeg-turbo.patch
+++ b/0001-Use-shared-version-of-libjpeg-turbo.patch
@@ -1,42 +1,34 @@
-From 9dc735727f5ae73ffb2d9b29fe079d0b0b4a7245 Mon Sep 17 00:00:00 2001
+From 7796485f7fd696f9e6b78b77eee65fc142be16f0 Mon Sep 17 00:00:00 2001
From: Mateusz Gozdek <mgozdekof@gmail.com>
-Date: Tue, 5 May 2020 12:06:57 +0200
+Date: Thu, 28 May 2020 09:32:03 +0200
Subject: [PATCH] Use shared version of libjpeg-turbo
-As Arch Linux does not provide static library file.
-
Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>
---
- linux/Makefile | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
+ linux/Makefile | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
-diff --git a/linux/Makefile b/linux/Makefile
-index 6995c18..a45957d 100644
---- a/linux/Makefile
-+++ b/linux/Makefile
-@@ -8,8 +8,7 @@
+diff --git linux/Makefile linux/Makefile
+index 0072361..9ccf019 100644
+--- linux/Makefile
++++ linux/Makefile
+@@ -6,15 +6,11 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # Use at your own risk. See README file for more details.
+-JPEG_DIR ?= /opt/libjpeg-turbo
+-JPEG_INCLUDE ?= $(JPEG_DIR)/include
+-JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
+-
CC = -no-pie
GTK = `pkg-config --libs --cflags gtk+-2.0` `pkg-config --libs x11`
--LIBS = `pkg-config --libs --cflags libswscale libavutil`
--JPEG = -I/opt/libjpeg-turbo/include /opt/libjpeg-turbo/lib`getconf LONG_BIT`/libturbojpeg.a
-+LIBS = `pkg-config --libs --cflags libswscale libavutil libturbojpeg`
- SRC = src/connection.c src/decoder.c
+ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
+ LIBS = -lspeex -lasound -lpthread -lm
+-JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
++JPEG = `pkg-config --libs --cflags libturbojpeg`
+ SRC = src/connection.c src/settings.c src/decoder*.c src/av.c src/adb.c
NO_WARN = -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
-@@ -23,10 +22,10 @@ endif
- all: droidcam-cli droidcam
-
- droidcam-cli: src/droidcam-cli.c $(SRC)
-- gcc -Wall $(CC) $(NO_WARN) $^ $(JPEG) $(LIBS) -lm -o droidcam-cli
-+ gcc -Wall $(CC) $(NO_WARN) $^ $(LIBS) -lm -o droidcam-cli
-
- droidcam: src/droidcam.c $(SRC)
-- gcc -Wall $(CC) $(NO_WARN) $^ $(GTK) $(JPEG) $(LIBS) -lm -o droidcam
-+ gcc -Wall $(CC) $(NO_WARN) $^ $(GTK) $(LIBS) -lm -o droidcam
-
- clean:
- rm droidcam || true
--
2.26.2
diff --git a/PKGBUILD b/PKGBUILD
index 39daf58752a..0b48a5362e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
# Past Contributor: James An <james@jamesan.ca>
pkgname=droidcam
-_pkgver=6c7b273bd20b23a5b1074d5af30f0a13ce3d6065
-pkgver=6.7.5.6c7b273
+pkgver=1.1
pkgrel=1
+epoch=1
pkgdesc='A tool for using your android device as a wireless/usb webcam'
arch=('x86_64')
url="https://www.dev47apps.com/${pkgname}/linuxx"
@@ -16,26 +16,26 @@ optdepends=('gtk2: use GUI version in addition to CLI interface' )
source=("${pkgname}.desktop"
"0001-Use-shared-version-of-libjpeg-turbo.patch"
- "droidcam.zip::https://github.com/aramg/${pkgname}/archive/${_pkgver}.zip"
+ "droidcam.zip::https://github.com/aramg/${pkgname}/archive/v${pkgver}.zip"
)
sha512sums=('72d21aa2d7eecc9bb070aaf7059a671246feb22f9c39b934a5463a4839f9347050de00754e5031dbc44f78eb2731f58f0cd2fcf781bc241f6fbd1abb4308b7ee'
- '238f41f5a3188226246e6446b3f8eceaf36472c0fb51dac995d535cf66cab27d9c43612fdfd553c57a398804db6ce817ecfaf2360ffbb53a404a05b6ac41a6bb'
- '0bc9d1223fe598f90cb537f9978bf35410248b366e0e3a9ea4815fbcb5a99e8fed8fe00833dacb678f3f125f7614e011276ae3835f91e50f78da87131bd381b8')
+ '4ae0849efb8f9183cae75d0ccc1459afe186de6479d47d4634c78c43ab9d92e46bf33d2f68e93134c4d67569cd5421d408013371ad2d5c33d60c0af5de284deb'
+ 'f02a76eb5323b62db9a54107a42e2150e2dfc27ab0acb5600ec0ed09e0512c2b7a21dd2105125d4f4d482348c807bf87f2d96131ce5b46e89d60a3b6f67d3a53')
prepare() {
- cd "${pkgname}-${_pkgver}"
- patch -p1 --input="${srcdir}/0001-Use-shared-version-of-libjpeg-turbo.patch"
+ cd "${pkgname}-${pkgver}"
+ patch -p0 --input="${srcdir}/0001-Use-shared-version-of-libjpeg-turbo.patch"
}
build() {
- cd ${pkgname}-${_pkgver}/linux
+ cd ${pkgname}-${pkgver}/linux
make
}
package() {
- cd ${pkgname}-${_pkgver}/linux
+ pushd ${pkgname}-${pkgver}/linux
# Install droidcam program files
install -Dm755 "${pkgname}" "$pkgdir/usr/bin/${pkgname}"