summaryrefslogtreecommitdiff
path: root/media-video/droidcam/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-09-17 11:17:07 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-09-17 11:17:07 +0100
commit0e6a8a6c51115943235f06224d9fd14b0eb41df3 (patch)
treef4911a7c07b15bd1bdef1e4f9a5c6ab23f3af58c /media-video/droidcam/files
parent8900e3e6f840b95c1c8126f9c283ca5c99f5f4fd (diff)
gentoo auto-resync : 17:09:2022 - 11:17:07
Diffstat (limited to 'media-video/droidcam/files')
-rw-r--r--media-video/droidcam/files/droidcam-1.8.2-makefile-fixes.patch (renamed from media-video/droidcam/files/droidcam-makefile-fixes.patch)15
1 files changed, 7 insertions, 8 deletions
diff --git a/media-video/droidcam/files/droidcam-makefile-fixes.patch b/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)