diff options
| author |   Andrew Ammerlaan <andrewammerlaan@riseup.net> | 2020-12-21 12:01:56 +0100 |
|---|---|---|
| committer | Andrew Ammerlaan <andrewammerlaan@riseup.net> | 2020-12-21 12:02:13 +0100 |
| commit | 5bdaa5668a57ff6e39632575ce56915b23f8be9d (patch) | |
| tree | f94597c3e60575ae78ed9c20e94df3dc09659c43 | |
| parent | x11-misc/i3lock-color: rdepend strongblock x11-misc/i3lock (diff) | |
| download | guru-5bdaa5668a57ff6e39632575ce56915b23f8be9d.tar.gz guru-5bdaa5668a57ff6e39632575ce56915b23f8be9d.tar.bz2 guru-5bdaa5668a57ff6e39632575ce56915b23f8be9d.zip | |
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@riseup.net>
| -rw-r--r-- | media-tv/droidcam/droidcam-1.6.ebuild | 2 | ||||
| -rw-r--r-- | 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 64118f6d10..42caab29ae 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 8ba20c4b4f..4fe51776fa 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 ./* |