| 1 |
commit: 2d3699f4f476d7ebc65d637f6d4a04a6ce73b3e3 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Mon May 11 09:32:17 2020 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Mon May 11 09:32:17 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2d3699f4 |
| 7 |
|
| 8 |
media-tv/droidcam: bump, no longer require static libs |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
| 12 |
|
| 13 |
media-tv/droidcam/Manifest | 2 +- |
| 14 |
...6.7.7_pre20200502.ebuild => droidcam-6.7.7_pre20200506.ebuild} | 4 ++-- |
| 15 |
media-tv/droidcam/files/droidcam-libjpeg-location.patch | 8 ++++---- |
| 16 |
3 files changed, 7 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest |
| 19 |
index f808078..affc279 100644 |
| 20 |
--- a/media-tv/droidcam/Manifest |
| 21 |
+++ b/media-tv/droidcam/Manifest |
| 22 |
@@ -1 +1 @@ |
| 23 |
-DIST droidcam-6.7.7_pre20200502.tar.gz 50633 BLAKE2B 5bbbbaf8ef8b84652a5100381ce9a6d4cd6fa57773676a8c0a22f3d28329e2891e3145a436e0330bc9b242987c48b451a9445c896aa7f84a349464e10e5238d9 SHA512 6259e07abd0c139ae0c7951222921817f508e44b4504b074f2656dda78ac6be71279d9ae15e85f82bee5b556543ca0adcb14ed3c80dca910e9af2af51b918e77 |
| 24 |
+DIST droidcam-6.7.7_pre20200506.tar.gz 54514 BLAKE2B 1a68736bf70b11f216eea9893bc858ea6b859c2d0b6a89d9e5e5c9d7a9dc1a7ed97d6e1cea96ae3c8683d08effa861c59b9576dcf804bbae7a25c368b3fee50b SHA512 e9864cdd311e91fd417ce5d33ec15ce76dd9b4f3fa50eef7dadddee8db2f788ad992dd869b1d27e41df02df1e9a08fec3544e539378808d3fa862ffdecea11a7 |
| 25 |
|
| 26 |
diff --git a/media-tv/droidcam/droidcam-6.7.7_pre20200502.ebuild b/media-tv/droidcam/droidcam-6.7.7_pre20200506.ebuild |
| 27 |
similarity index 94% |
| 28 |
rename from media-tv/droidcam/droidcam-6.7.7_pre20200502.ebuild |
| 29 |
rename to media-tv/droidcam/droidcam-6.7.7_pre20200506.ebuild |
| 30 |
index ec25e57..c0441bc 100644 |
| 31 |
--- a/media-tv/droidcam/droidcam-6.7.7_pre20200502.ebuild |
| 32 |
+++ b/media-tv/droidcam/droidcam-6.7.7_pre20200506.ebuild |
| 33 |
@@ -3,7 +3,7 @@ |
| 34 |
|
| 35 |
EAPI=7 |
| 36 |
|
| 37 |
-COMMIT="6cc7cb6266f4ac089cf3bbef2d2ae8fe590f1750" |
| 38 |
+COMMIT="98cbf07def9604f92fd74ea2964d483347388909" |
| 39 |
|
| 40 |
inherit desktop linux-mod xdg |
| 41 |
|
| 42 |
@@ -19,7 +19,7 @@ SLOT="0" |
| 43 |
# Requires connection to android phone |
| 44 |
RESTRICT="test" |
| 45 |
|
| 46 |
-BDEPEND="media-libs/libjpeg-turbo[static-libs]" |
| 47 |
+BDEPEND="media-libs/libjpeg-turbo" |
| 48 |
|
| 49 |
RDEPEND="x11-libs/gtk+:2" |
| 50 |
|
| 51 |
|
| 52 |
diff --git a/media-tv/droidcam/files/droidcam-libjpeg-location.patch b/media-tv/droidcam/files/droidcam-libjpeg-location.patch |
| 53 |
index b0b35d8..1b1a1e0 100644 |
| 54 |
--- a/media-tv/droidcam/files/droidcam-libjpeg-location.patch |
| 55 |
+++ b/media-tv/droidcam/files/droidcam-libjpeg-location.patch |
| 56 |
@@ -1,13 +1,13 @@ |
| 57 |
diff --git a/Makefile b/Makefile |
| 58 |
-index 6995c18..41f56b6 100644 |
| 59 |
+index 3a37443..2a68b2e 100644 |
| 60 |
--- a/Makefile |
| 61 |
+++ b/Makefile |
| 62 |
-@@ -9,7 +9,7 @@ |
| 63 |
+@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT` |
| 64 |
CC = -no-pie |
| 65 |
GTK = `pkg-config --libs --cflags gtk+-2.0` `pkg-config --libs x11` |
| 66 |
LIBS = `pkg-config --libs --cflags libswscale libavutil` |
| 67 |
--JPEG = -I/opt/libjpeg-turbo/include /opt/libjpeg-turbo/lib`getconf LONG_BIT`/libturbojpeg.a |
| 68 |
-+JPEG = -I/usr/include /usr/lib`getconf LONG_BIT`/libturbojpeg.a |
| 69 |
+-JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a |
| 70 |
++JPEG = -I/usr/include /usr/lib`getconf LONG_BIT`/libturbojpeg.so |
| 71 |
SRC = src/connection.c src/decoder.c |
| 72 |
NO_WARN = -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast |
Archives