mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-18 11:33:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2021-03-05 21:21:54 +00:00
parent 1e41417424 cf22746fd3
commit 97393606d3
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-tv/droidcam/Manifest
View File

@@ -1 +1 @@
DIST droidcam-1.7.tar.gz 81605 BLAKE2B 81d2ffa1b3cb0f9791c4459c75aeaacb701d03cbde11c76cd18ff569854f304b5bb359552a9c0a3a8bbb32f2d9c0fa8bdc7a2eec9b60a047138098c3dea4aaf4 SHA512 d41df620734c51fca49d411b96cd2889269df9548044af2c0b165025f08205a5a99a9e4c5896742174833a2b00ed89d8dd955b593d4acc39cbac658282841439
DIST droidcam-1.7.2.tar.gz 82690 BLAKE2B 3b7312f081dff747ccc9f8fab9a81bee079f697fa6bf8eb6982efa443a300751b9e8ebaa196950fc2c543e9abda3d9d7d26edc986cc916c36dcbccf9f6db0102 SHA512 0515760b3705abcb46acae5bbc05bba1d82416853c6438f776f6170e7469372d4d4236aae3500d409e572ae4e5289d3bd7416ed2729ea929e21146994c2de51c

0
media-tv/droidcam/droidcam-1.7.ebuild → media-tv/droidcam/droidcam-1.7.2.ebuild
View File

28
media-tv/droidcam/files/droidcam-makefile-fixes.patch
View File

@@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile
index d1c514e..5abd541 100644
index 54738f5..bcb5800 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
@@ -6,25 +6,25 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# Use at your own risk. See README file for more details.
@@ -11,13 +11,16 @@ index d1c514e..5abd541 100644
JPEG_INCLUDE ?= $(JPEG_DIR)/include
JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
@@ -16,15 +16,15 @@ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
GTK += `pkg-config --cflags --libs appindicator3-0.1`
CXX = g++
CXXFLAGS = -std=c++11 -Wall -fPIC -no-pie
GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
-#GTK += `pkg-config --cflags --libs appindicator3-0.1`
+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
SRC = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c
-USBMUXD = -lusbmuxd
+USBMUXD = -lusbmuxd-2.0
@@ -31,16 +34,17 @@ index d1c514e..5abd541 100644
package: clean all
zip "droidcam_$(RELEASE).zip" \
LICENSE README* icon2.png \
@@ -39,10 +39,10 @@ gresource: .gresource.xml icon2.png
glib-compile-resources .gresource.xml --generate-source --target=src/resources.c
@@ -40,11 +40,11 @@ gresource: .gresource.xml icon2.png
droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS)
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
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
droidcam: LDLIBS += $(GTK) $(JPEG) $(LIBAV) $(LIBS)
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
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
clean:
rm droidcam || true
rm -f droidcam