| 1 |
commit: 36dcfcaed8c14a8bffd2c6ae37ff41e4fadfd238 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Fri Oct 2 14:04:03 2020 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Fri Oct 2 14:04:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=36dcfcae |
| 7 |
|
| 8 |
media-tv/droidcam: version bump 1.5 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 11 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
| 12 |
|
| 13 |
media-tv/droidcam/Manifest | 2 +- |
| 14 |
...{droidcam-1.4-r1.ebuild => droidcam-1.5.ebuild} | 3 ++- |
| 15 |
.../droidcam/files/droidcam-makefile-fixes.patch | 27 +++++++++++----------- |
| 16 |
3 files changed, 17 insertions(+), 15 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest |
| 19 |
index 13a8d36b..3a01d0a2 100644 |
| 20 |
--- a/media-tv/droidcam/Manifest |
| 21 |
+++ b/media-tv/droidcam/Manifest |
| 22 |
@@ -1 +1 @@ |
| 23 |
-DIST droidcam-1.4.tar.gz 84350 BLAKE2B 3d627f94aa9d04b3ce9785005b5a3d06895c74254001033c7d881bdc2359e3d34db5668e0df59a9f293014f7cd78e6f4aa07f25cd8a8ed3f54c1658a9406e7d8 SHA512 60ca2d15514a03a71e04e0f5e1382a5af4e7244329d4113e8af1dd0adb8a448febc60adf94bbcad8db8de0e0ffd906de1f2427488dc9e27ebe7739c7331ac99d |
| 24 |
+DIST droidcam-1.5.tar.gz 79700 BLAKE2B 05ec5eccec3f4fcec0457fad3b092ae3312c6de3c7cf9d574d002eaa06c92f1f93631c5dc36ed3465f4941a51b37f22b404815d88150604f5f02cf7593006340 SHA512 b441d1c69b77522d427b729439d4efa041a93b224e9fd7f7502260aac8a334a110152592670903cc4df8a194707f78a52a0c14cfcdd52a1e8ea7c391e6fd586c |
| 25 |
|
| 26 |
diff --git a/media-tv/droidcam/droidcam-1.4-r1.ebuild b/media-tv/droidcam/droidcam-1.5.ebuild |
| 27 |
similarity index 99% |
| 28 |
rename from media-tv/droidcam/droidcam-1.4-r1.ebuild |
| 29 |
rename to media-tv/droidcam/droidcam-1.5.ebuild |
| 30 |
index 6642f54a..64118f6d 100644 |
| 31 |
--- a/media-tv/droidcam/droidcam-1.4-r1.ebuild |
| 32 |
+++ b/media-tv/droidcam/droidcam-1.5.ebuild |
| 33 |
@@ -22,11 +22,12 @@ RESTRICT="test" |
| 34 |
DEPEND=" |
| 35 |
=app-pda/libusbmuxd-1* |
| 36 |
dev-libs/glib |
| 37 |
+ dev-libs/libappindicator:3 |
| 38 |
+ dev-util/android-tools |
| 39 |
media-libs/alsa-lib |
| 40 |
media-libs/libjpeg-turbo |
| 41 |
>=media-libs/speex-1.2.0-r1 |
| 42 |
media-video/ffmpeg |
| 43 |
- dev-util/android-tools |
| 44 |
gtk? ( |
| 45 |
dev-cpp/gtkmm:3.0 |
| 46 |
x11-libs/gdk-pixbuf |
| 47 |
|
| 48 |
diff --git a/media-tv/droidcam/files/droidcam-makefile-fixes.patch b/media-tv/droidcam/files/droidcam-makefile-fixes.patch |
| 49 |
index 238898c9..8ba20c4b 100644 |
| 50 |
--- a/media-tv/droidcam/files/droidcam-makefile-fixes.patch |
| 51 |
+++ b/media-tv/droidcam/files/droidcam-makefile-fixes.patch |
| 52 |
@@ -1,44 +1,45 @@ |
| 53 |
diff --git a/Makefile b/Makefile |
| 54 |
-index 97a6e1f..6779293 100644 |
| 55 |
+index 91ca3af..408de37 100644 |
| 56 |
--- a/Makefile |
| 57 |
+++ b/Makefile |
| 58 |
@@ -6,7 +6,7 @@ |
| 59 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 60 |
# Use at your own risk. See README file for more details. |
| 61 |
- |
| 62 |
+ |
| 63 |
-JPEG_DIR ?= /opt/libjpeg-turbo |
| 64 |
+JPEG_DIR ?= /usr |
| 65 |
JPEG_INCLUDE ?= $(JPEG_DIR)/include |
| 66 |
JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT` |
| 67 |
- |
| 68 |
-@@ -15,14 +15,14 @@ CC = -std=c++11 -x c++ -Wall -fPIC -no-pie |
| 69 |
- GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11` |
| 70 |
+ |
| 71 |
+@@ -16,15 +16,15 @@ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11` |
| 72 |
+ GTK += `pkg-config --cflags --libs appindicator3-0.1` |
| 73 |
LIBAV = `pkg-config --libs --cflags libswscale libavutil` |
| 74 |
LIBS = -lspeex -lasound -lpthread -lm |
| 75 |
-JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a |
| 76 |
+JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.so |
| 77 |
SRC = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c |
| 78 |
- |
| 79 |
+ USBMUXD = -lusbmuxd |
| 80 |
+ |
| 81 |
all: droidcam-cli droidcam |
| 82 |
- |
| 83 |
+ |
| 84 |
ifeq "$(RELEASE)" "1" |
| 85 |
-LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.a /usr/lib/x86_64-linux-gnu/libavutil.a |
| 86 |
-SRC += /usr/lib/x86_64-linux-gnu/libusbmuxd.a /usr/lib/x86_64-linux-gnu/libxml2.a src/libplist-2.0.a |
| 87 |
+LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.so /usr/lib/x86_64-linux-gnu/libavutil.so |
| 88 |
+SRC += /usr/lib/x86_64-linux-gnu/libusbmuxd.so /usr/lib/x86_64-linux-gnu/libxml2.so src/libplist-2.0.so |
| 89 |
package: clean all |
| 90 |
- zip -x *.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./* |
| 91 |
- |
| 92 |
-@@ -34,10 +34,10 @@ gresource: .gresource.xml icon2.png |
| 93 |
+ zip -x icon.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./* |
| 94 |
+ |
| 95 |
+@@ -36,10 +36,10 @@ gresource: .gresource.xml icon2.png |
| 96 |
glib-compile-resources .gresource.xml --generate-source --target=src/resources.c |
| 97 |
- |
| 98 |
+ |
| 99 |
droidcam-cli: src/droidcam-cli.c $(SRC) |
| 100 |
- $(GXX) $(CC) $^ $(JPEG) $(LIBAV) $(LIBS) -o droidcam-cli |
| 101 |
+ $(GXX) $(CC) $(LDFLAGS) $(CFLAGS) $^ $(JPEG) $(LIBAV) $(LIBS) -o droidcam-cli |
| 102 |
- |
| 103 |
+ |
| 104 |
droidcam: src/droidcam.c src/resources.c $(SRC) |
| 105 |
- $(GXX) $(CC) $^ $(GTK) $(JPEG) $(LIBAV) $(LIBS) -o droidcam |
| 106 |
+ $(GXX) $(CC) $(LDFLAGS) $(CFLAGS) $^ $(GTK) $(JPEG) $(LIBAV) $(LIBS) -o droidcam |
| 107 |
- |
| 108 |
+ |
| 109 |
clean: |
| 110 |
rm droidcam || true |
Archives