commit: adfaa9da31cfbfbcd89a3bc97347526787b5c01e Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Sat Sep 17 08:33:24 2022 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sat Sep 17 08:35:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adfaa9da
media-video/droidcam: use pkg-config to find libjpeg-turbo Closes: https://bugs.gentoo.org/870607 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> .../{droidcam-1.8.2.ebuild => droidcam-1.8.2-r1.ebuild} | 2 +- ...le-fixes.patch => droidcam-1.8.2-makefile-fixes.patch} | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/media-video/droidcam/droidcam-1.8.2.ebuild b/media-video/droidcam/droidcam-1.8.2-r1.ebuild similarity index 98% rename from media-video/droidcam/droidcam-1.8.2.ebuild rename to media-video/droidcam/droidcam-1.8.2-r1.ebuild index 5f32002d8d66..53150f3a9c28 100644 --- a/media-video/droidcam/droidcam-1.8.2.ebuild +++ b/media-video/droidcam/droidcam-1.8.2-r1.ebuild @@ -46,7 +46,7 @@ MODULESD_V4L2LOOPBACK_DC_ENABLED="yes" CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT" ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support" -PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch" +PATCHES="${FILESDIR}/${PN}-1.8.2-makefile-fixes.patch" src_prepare() { if ! use gtk; then diff --git a/media-video/droidcam/files/droidcam-makefile-fixes.patch b/media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch similarity index 87% rename from media-video/droidcam/files/droidcam-makefile-fixes.patch rename to media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch index 9c6ad4c45c09..56b7589b2d12 100644 --- a/media-video/droidcam/files/droidcam-makefile-fixes.patch +++ b/media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch @@ -1,16 +1,15 @@ diff --git a/Makefile b/Makefile -index 7be3c15..8af0953 100644 +index 7be3c15..85ef623 100644 --- a/Makefile +++ b/Makefile -@@ -6,25 +6,23 @@ +@@ -6,25 +6,19 @@ # 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` - +-JPEG_INCLUDE ?= $(JPEG_DIR)/include +-JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT` +- -CC = gcc -CFLAGS = -Wall -O2 GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11` @@ -18,7 +17,7 @@ index 7be3c15..8af0953 100644 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 ++JPEG = `pkg-config --libs --cflags libturbojpeg` SRC = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c src/queue.c -USBMUXD = -lusbmuxd +USBMUXD = -lusbmuxd-2.0 @@ -33,7 +32,7 @@ index 7be3c15..8af0953 100644 package: clean all zip "droidcam_$(RELEASE).zip" \ LICENSE README* icon2.png \ -@@ -40,11 +38,11 @@ gresource: .gresource.xml icon2.png +@@ -40,11 +34,11 @@ gresource: .gresource.xml icon2.png droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS) droidcam-cli: src/droidcam-cli.c $(SRC)
