diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-01 22:03:23 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-01 22:03:23 +0100 |
| commit | 590b9b7b03bf4651e099949e318755af7cfa81b8 (patch) | |
| tree | 54c184b7d26c25f1922bfeaf19a1dd45a2e3b1eb /media-video/droidcam | |
| parent | f4fc10428424904caf2035cffc442195cb088b2c (diff) | |
gentoo resync : 01.08.2021
Diffstat (limited to 'media-video/droidcam')
| -rw-r--r-- | media-video/droidcam/Manifest | 6 | ||||
| -rw-r--r-- | media-video/droidcam/droidcam-1.8.0.ebuild (renamed from media-video/droidcam/droidcam-1.7.3.ebuild) | 10 | ||||
| -rw-r--r-- | media-video/droidcam/files/droidcam-makefile-fixes.patch | 12 |
3 files changed, 15 insertions, 13 deletions
diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest index 65d681babb72..6da92260ef0a 100644 --- a/media-video/droidcam/Manifest +++ b/media-video/droidcam/Manifest @@ -1,4 +1,4 @@ -AUX droidcam-makefile-fixes.patch 1830 BLAKE2B f1a5c48b36160797c3f75b54620b673640a4bc41178a43bd3ffa80d11068afb2b683c29169b5158db03b7851b0ca7fe890239c844d6885d2b79c7b203d8861d7 SHA512 522a15aa19d8e2fe55d078558f530015919f21e438a3cd5e424ef460c62a5fbb8745ede24e76852d84ac5e0ca00bd8fbeec3b9ef05d891cade574cb6de017756 -DIST droidcam-1.7.3.tar.gz 83146 BLAKE2B b79d210a7d6a3cee7322b373cd92b2c1a326dd9887dff1df752e9818f9e7ed88dfdfd4a33a22ccb39c601df81c4e9538b1efa8029a9ad56f39d400fc50bc746b SHA512 39d6947b66f1be7896c56aa01d471cbd025deaeb2d2359f9434e5ea91e4302f4c16ee31486bb04fab1dfc7f6d8b2de3f6800ead665b7b3d366b01b25297beaba -EBUILD droidcam-1.7.3.ebuild 3015 BLAKE2B 2d2104d1dec0389fae851e9a9b84e103f84355194b9aca64b0e3707ce36135b9206b798a8035475f6e1cd6a5a13abea83a1c3a983fb18bc392c593f956af2d63 SHA512 fc44d8d9b5c1b2beff2b2182aefd5c0884b403c94cf14c85164760530b89649b4da3035fb9df65d9af1260f5e99da75f021c4c72613434555bf4a318d4512f25 +AUX droidcam-makefile-fixes.patch 1834 BLAKE2B de9b0ae494e419d89dee767afcc78fc8d5222dcd54706ec94a875c032e835015ef60b8a60285a99974df5dde35becd742432bb81e818574022fd699af021e9ad SHA512 5490ce729f622ae93319a299317c1d394cb7af1f1b71c71c1927ae259a6cce682b705eb26fc0c95c467716c9f79b81688ba2d12e33c1c8af4b454333d8cdbca8 +DIST droidcam-1.8.0.tar.gz 84376 BLAKE2B 581e57e2c80dd9662764e399dd797e5893f617e69ee2501a1063d1c51434baf64d7d2b72779debede6d679127f31fa95a4e67953978da591acbf6a41bd05551d SHA512 b448f686562030b352630c6b677a098ecb5041582dd06e57809b04674cb334d02ddfdf1d09b43e1ecc70897e8073714ad6913ab14d894a7679fc433adb3fda82 +EBUILD droidcam-1.8.0.ebuild 3094 BLAKE2B 942b8790090c2edbd1a9f35bf7d34e451f51b903a96c62424433b982959c7fc3ecb55a01c5b069869953b416cc6aa421760ca680da7d36dfdaed2fb0f3b5ea98 SHA512 6dc37f34ca0f9f0c4c8e2d0ceb0c8e778726baddd59c3e9c58177f128e8088bb0c92113093ae05e617f54f9fde1f42163908301420aef730c0105902950cc221 MISC metadata.xml 1420 BLAKE2B 5169fa76ab742c2992797bf82e8f4a783134eddbb11c00d21c18b5d271bafdce6501ef31c35f461836081014ddf444070e27bf94e45a86d8f912bbf0519ca5ce SHA512 344a159166adba2beb80621d1d798038646af18878497b03e46c9458d306b1615e8feac8fad8be502474919da00cb550cc74499967f74157ce1b6a717eb0a8f8 diff --git a/media-video/droidcam/droidcam-1.7.3.ebuild b/media-video/droidcam/droidcam-1.8.0.ebuild index 9ac87c8084a8..60f47eb1847b 100644 --- a/media-video/droidcam/droidcam-1.7.3.ebuild +++ b/media-video/droidcam/droidcam-1.8.0.ebuild @@ -54,8 +54,10 @@ src_prepare() { sed -i -e '/cflags gtk+/d' Makefile || die default else - # remove path and extension from icon entry - sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' droidcam.desktop || die + # remove path and extension from Icon and Exec entry + sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \ + -e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \ + droidcam.desktop || die sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die xdg_src_prepare fi @@ -75,10 +77,10 @@ src_compile() { } src_test() { - pushd "v4l2loopback" + pushd "v4l2loopback" || die default ./test || die - popd + popd || die } src_install() { diff --git a/media-video/droidcam/files/droidcam-makefile-fixes.patch b/media-video/droidcam/files/droidcam-makefile-fixes.patch index c413d7edd11c..5230c18f0f33 100644 --- a/media-video/droidcam/files/droidcam-makefile-fixes.patch +++ b/media-video/droidcam/files/droidcam-makefile-fixes.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index b5f696c..bcb5800 100644 +index 7be3c15..099a707 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ @@ -17,7 +17,7 @@ index b5f696c..bcb5800 100644 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 src/queue.c -USBMUXD = -lusbmuxd +USBMUXD = -lusbmuxd-2.0 @@ -35,13 +35,13 @@ index b5f696c..bcb5800 100644 droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS) droidcam-cli: src/droidcam-cli.c $(SRC) -- $(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) +- $(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) -- $(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) +- $(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) ++ $(CC) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) clean: rm -f droidcam |