diff options
| author |   Andrew Ammerlaan <andrewammerlaan@riseup.net> | 2020-10-02 16:04:03 +0200 |
|---|---|---|
| committer | Andrew Ammerlaan <andrewammerlaan@riseup.net> | 2020-10-02 16:04:03 +0200 |
| commit | 36dcfcaed8c14a8bffd2c6ae37ff41e4fadfd238 (patch) | |
| tree | 28ac4c0b0d1400c26d046bf04663b1cc4301126f | |
| parent | sys-apps/sampler-bin: add bin version of sampler (diff) | |
| download | guru-36dcfcae.tar.gz guru-36dcfcae.tar.bz2 guru-36dcfcae.zip | |
media-tv/droidcam: version bump 1.5
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
| -rw-r--r-- | media-tv/droidcam/Manifest | 2 | ||||
| -rw-r--r-- | media-tv/droidcam/droidcam-1.5.ebuild (renamed from media-tv/droidcam/droidcam-1.4-r1.ebuild) | 3 | ||||
| -rw-r--r-- | media-tv/droidcam/files/droidcam-makefile-fixes.patch | 27 |
3 files changed, 17 insertions, 15 deletions
diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest index 13a8d36b0f..3a01d0a2c0 100644 --- a/media-tv/droidcam/Manifest +++ b/media-tv/droidcam/Manifest @@ -1 +1 @@ -DIST droidcam-1.4.tar.gz 84350 BLAKE2B 3d627f94aa9d04b3ce9785005b5a3d06895c74254001033c7d881bdc2359e3d34db5668e0df59a9f293014f7cd78e6f4aa07f25cd8a8ed3f54c1658a9406e7d8 SHA512 60ca2d15514a03a71e04e0f5e1382a5af4e7244329d4113e8af1dd0adb8a448febc60adf94bbcad8db8de0e0ffd906de1f2427488dc9e27ebe7739c7331ac99d +DIST droidcam-1.5.tar.gz 79700 BLAKE2B 05ec5eccec3f4fcec0457fad3b092ae3312c6de3c7cf9d574d002eaa06c92f1f93631c5dc36ed3465f4941a51b37f22b404815d88150604f5f02cf7593006340 SHA512 b441d1c69b77522d427b729439d4efa041a93b224e9fd7f7502260aac8a334a110152592670903cc4df8a194707f78a52a0c14cfcdd52a1e8ea7c391e6fd586c diff --git a/media-tv/droidcam/droidcam-1.4-r1.ebuild b/media-tv/droidcam/droidcam-1.5.ebuild index 6642f54a50..64118f6d10 100644 --- a/media-tv/droidcam/droidcam-1.4-r1.ebuild +++ b/media-tv/droidcam/droidcam-1.5.ebuild @@ -22,11 +22,12 @@ RESTRICT="test" DEPEND=" =app-pda/libusbmuxd-1* dev-libs/glib + dev-libs/libappindicator:3 + dev-util/android-tools media-libs/alsa-lib media-libs/libjpeg-turbo >=media-libs/speex-1.2.0-r1 media-video/ffmpeg - dev-util/android-tools gtk? ( dev-cpp/gtkmm:3.0 x11-libs/gdk-pixbuf diff --git a/media-tv/droidcam/files/droidcam-makefile-fixes.patch b/media-tv/droidcam/files/droidcam-makefile-fixes.patch index 238898c9f0..8ba20c4b4f 100644 --- a/media-tv/droidcam/files/droidcam-makefile-fixes.patch +++ b/media-tv/droidcam/files/droidcam-makefile-fixes.patch @@ -1,44 +1,45 @@ diff --git a/Makefile b/Makefile -index 97a6e1f..6779293 100644 +index 91ca3af..408de37 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # Use at your own risk. See README file for more details. - + -JPEG_DIR ?= /opt/libjpeg-turbo +JPEG_DIR ?= /usr JPEG_INCLUDE ?= $(JPEG_DIR)/include JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT` - -@@ -15,14 +15,14 @@ CC = -std=c++11 -x c++ -Wall -fPIC -no-pie - GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11` + +@@ -16,15 +16,15 @@ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11` + GTK += `pkg-config --cflags --libs appindicator3-0.1` LIBAV = `pkg-config --libs --cflags libswscale libavutil` LIBS = -lspeex -lasound -lpthread -lm -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 + all: droidcam-cli droidcam - + ifeq "$(RELEASE)" "1" -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 package: clean all - zip -x *.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./* - -@@ -34,10 +34,10 @@ gresource: .gresource.xml icon2.png + zip -x icon.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./* + +@@ -36,10 +36,10 @@ gresource: .gresource.xml icon2.png glib-compile-resources .gresource.xml --generate-source --target=src/resources.c - + droidcam-cli: src/droidcam-cli.c $(SRC) - $(GXX) $(CC) $^ $(JPEG) $(LIBAV) $(LIBS) -o droidcam-cli + $(GXX) $(CC) $(LDFLAGS) $(CFLAGS) $^ $(JPEG) $(LIBAV) $(LIBS) -o droidcam-cli - + droidcam: src/droidcam.c src/resources.c $(SRC) - $(GXX) $(CC) $^ $(GTK) $(JPEG) $(LIBAV) $(LIBS) -o droidcam + $(GXX) $(CC) $(LDFLAGS) $(CFLAGS) $^ $(GTK) $(JPEG) $(LIBAV) $(LIBS) -o droidcam - + clean: rm droidcam || true |