commit: 5bdaa5668a57ff6e39632575ce56915b23f8be9d
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Dec 21 11:01:56 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Dec 21 11:02:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5bdaa566
media-tv/droidcam: allow use of libusbmuxd-2.0
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
media-tv/droidcam/droidcam-1.6.ebuild | 2 +-
media-tv/droidcam/files/droidcam-makefile-fixes.patch | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/media-tv/droidcam/droidcam-1.6.ebuild
b/media-tv/droidcam/droidcam-1.6.ebuild
index 64118f6d..42caab29 100644
--- a/media-tv/droidcam/droidcam-1.6.ebuild
+++ b/media-tv/droidcam/droidcam-1.6.ebuild
@@ -20,7 +20,7 @@ IUSE="gtk"
RESTRICT="test"
DEPEND="
- =app-pda/libusbmuxd-1*
+ app-pda/libusbmuxd
dev-libs/glib
dev-libs/libappindicator:3
dev-util/android-tools
diff --git a/media-tv/droidcam/files/droidcam-makefile-fixes.patch
b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
index 8ba20c4b..4fe51776 100644
--- a/media-tv/droidcam/files/droidcam-makefile-fixes.patch
+++ b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
@@ -1,5 +1,5 @@
diff --git a/Makefile b/Makefile
-index 91ca3af..408de37 100644
+index 91ca3af..16afe8b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
@@ -18,7 +18,8 @@ index 91ca3af..408de37 100644
-JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.so
SRC = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c
- USBMUXD = -lusbmuxd
+-USBMUXD = -lusbmuxd
++USBMUXD = -lusbmuxd-2.0
all: droidcam-cli droidcam
@@ -26,7 +27,7 @@ index 91ca3af..408de37 100644
-LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.a
/usr/lib/x86_64-linux-gnu/libavutil.a
-SRC += /usr/lib/x86_64-linux-gnu/libusbmuxd.a
/usr/lib/x86_64-linux-gnu/libxml2.a src/libplist-2.0.a
+LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.so
/usr/lib/x86_64-linux-gnu/libavutil.so
-+SRC += /usr/lib/x86_64-linux-gnu/libusbmuxd.so
/usr/lib/x86_64-linux-gnu/libxml2.so src/libplist-2.0.so
++SRC += /usr/lib/x86_64-linux-gnu/libusbmuxd-2.0.so
/usr/lib/x86_64-linux-gnu/libxml2.so src/libplist-2.0.so
package: clean all
zip -x icon.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./*
