diff options
author | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2022-09-17 10:33:24 +0200 |
---|---|---|
committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2022-09-17 10:35:13 +0200 |
commit | adfaa9da31cfbfbcd89a3bc97347526787b5c01e (patch) | |
tree | 8a902775b6b341ef6b410f015332085057ed18b0 /media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch | |
parent | www-servers/tornado: Stabilize 6.2 arm64, #870325 (diff) | |
download | gentoo-adfaa9da31cfbfbcd89a3bc97347526787b5c01e.tar.gz gentoo-adfaa9da31cfbfbcd89a3bc97347526787b5c01e.tar.bz2 gentoo-adfaa9da31cfbfbcd89a3bc97347526787b5c01e.zip |
media-video/droidcam: use pkg-config to find libjpeg-turbo
Closes: https://bugs.gentoo.org/870607
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch')
-rw-r--r-- | media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch b/media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch new file mode 100644 index 000000000000..56b7589b2d12 --- /dev/null +++ b/media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch @@ -0,0 +1,61 @@ +diff --git a/Makefile b/Makefile +index 7be3c15..85ef623 100644 +--- a/Makefile ++++ b/Makefile +@@ -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_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` + 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 = `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 + + all: droidcam-cli droidcam + + ifneq "$(RELEASE)" "" +-LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.a /usr/lib/x86_64-linux-gnu/libavutil.a +-SRC += src/libusbmuxd.a src/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 += src/libusbmuxd-2.0.so src/libxml2.so src/libplist-2.0.so + package: clean all + zip "droidcam_$(RELEASE).zip" \ + LICENSE README* icon2.png \ +@@ -40,11 +34,11 @@ gresource: .gresource.xml icon2.png + + droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS) + droidcam-cli: src/droidcam-cli.c $(SRC) +- $(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) ++ $(CC) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) + + droidcam: LDLIBS += $(GTK) $(JPEG) $(LIBAV) $(LIBS) + droidcam: src/droidcam.c src/resources.c $(SRC) +- $(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) ++ $(CC) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) + + clean: + rm -f droidcam +diff --git a/v4l2loopback/Makefile b/v4l2loopback/Makefile +index 28c4502..02356e9 100644 +--- a/v4l2loopback/Makefile ++++ b/v4l2loopback/Makefile +@@ -11,7 +11,7 @@ install: + $(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules_install + + test: +- gcc test.c -o test ++ $(CC) test.c -o test + + clean: + $(MAKE) -C $(KERNEL_DIR) M=$(PWD) clean |