diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-09-17 11:17:07 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-17 11:17:07 +0100 |
| commit | 0e6a8a6c51115943235f06224d9fd14b0eb41df3 (patch) | |
| tree | f4911a7c07b15bd1bdef1e4f9a5c6ab23f3af58c /media-video | |
| parent | 8900e3e6f840b95c1c8126f9c283ca5c99f5f4fd (diff) | |
gentoo auto-resync : 17:09:2022 - 11:17:07
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/Manifest.gz | bin | 25839 -> 25842 bytes | |||
| -rw-r--r-- | media-video/droidcam/Manifest | 4 | ||||
| -rw-r--r-- | media-video/droidcam/droidcam-1.8.2-r1.ebuild (renamed from media-video/droidcam/droidcam-1.8.2.ebuild) | 2 | ||||
| -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 |
4 files changed, 10 insertions, 11 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 702dff978e45..5e4ff61a82e9 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest index af38b128f0e1..cf652118646e 100644 --- a/media-video/droidcam/Manifest +++ b/media-video/droidcam/Manifest @@ -1,4 +1,4 @@ -AUX droidcam-makefile-fixes.patch 2178 BLAKE2B 223344a2138b0a93f7eaffda4814236acf19a7cf6d4ee6daa03be3b7c601b549ce77219d03f53dbb1ac11493ff991c08f8d035fb91dbed22b590c07628318640 SHA512 73082410683b81794589816a3158ea66ce1c6717f65454f4528e1b00298c88131fec3f460915cfb603ccb85be1b54134869444924bf63c69cee89f03a275b556 +AUX droidcam-1.8.2-makefile-fixes.patch 2156 BLAKE2B 285f07e3fcf679878b0eec87d04dd411c4c15af90bf9d0e1509d330159c057d224125cda98bdaaaf65b4d8b420d9501b10185a8ff8a7a4dfb93cf002e2e882fe SHA512 02c97d9a22209218f8b8b3a245bf83ea095a9f3b6999b3bd11aa43374ef65eb87d361b7d34a9cfd1fcb879c1136f2f356cd4511f3c05188bea523edacf606fbe DIST droidcam-1.8.2.tar.gz 84797 BLAKE2B b2458dd04b467106a6d9a8a9f3d44058641a7c8ca429d5c92f498401c07f6bc364dc056755f21b40faac7e7aec1877250afb119ac3b7f979b24cdeb86f45c384 SHA512 507f513c8d0dffa86afe5368ccab5461931e236b6352269a6eb5e970a79e5f9b386808da3466f3b391e955170b47b24a82663632ddc3c3c84e4de5988b7d3f8f -EBUILD droidcam-1.8.2.ebuild 3454 BLAKE2B 7c61b43a0aa8f36bd052325f2b5f0b7bc845a2b761b6a91e109a15bd5ddd490dbe9ca498441b15f0924ab18433309139c3bb798b886254d7c5f4dcd19366b215 SHA512 e04361ee773793c5291faa8f608697aa8b0a90c7350d535dc4d43ca05c518c6f0a9b212a0a49f40fa0742b0b674374938309fe6ab017733ab65a97905deab100 +EBUILD droidcam-1.8.2-r1.ebuild 3460 BLAKE2B 90b337253fb83989eb5824bd7556c9b64c8df235be51d8576c914576d601f50d398307afd73fd474b1ffdccb8cf7cf50c300c6a1fc5e0b85780dabe8a0338d4e SHA512 82b6c5aa23db6cad507d515251c85d011b3272a98169cf293b142c7a139d4f18fe626d703b0c355fb245e04430c08dc1dc83a0d214f1051ec42dda5ba983b201 MISC metadata.xml 1421 BLAKE2B 6d46f5cbd0a226d749b35d8e90a965d4f12fa609b6e95ea6effe87730bce525c0fadb14aa3eb8b99d60f91c7c46a542df5073a55f018f9c06877758360b91e60 SHA512 9dfe075ab79599ecfa3cb9cbf607e4e9a14dd6d002fb3f84bd2d809d962a8bf52b7a0a7166b6805ce4816a57c08e57ab4b224ae1de4e44130bb52f1674ea1e02 diff --git a/media-video/droidcam/droidcam-1.8.2.ebuild b/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 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) |