2 files changed, 0 insertions, 69 deletions
diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest
index 02f464423849..97a74b26ddbd 100644
--- a/media-video/droidcam/Manifest
+++ b/media-video/droidcam/Manifest
@@ -1,4 +1,3 @@
-AUX droidcam-1.8.2_p20220831-makefile-fixes.patch 2181 BLAKE2B 82cfc66741ac1794ed822e6bd633600bc00e2289eb5bd3a3b2ca4ac71110262ba894503e07f089c46a1650e48d751b72893952393d874767afaa6ccb5e2c65a1 SHA512 abe964a3562ddcd7926f4985c9713ceae3881929b5eae2443461a2828e05975acc84901bf633f06116891170af91f9a6af5990f40303cce6c8b25c1ab33290ef
 AUX droidcam-2.0.0-libusbmuxd-20.patch 580 BLAKE2B 96f00d52d250f4153240e21cebffd0029dc3940aa61cde5295053d0842a28d61f570eb127ed681cc6a1e96b2c0f618c2dfa2f0cc6473fb08fc3cdd73826f72d4 SHA512 cb43712132eae371d2ed06462ba2e5ab69b50d1494ef1bf942d867302aaa4f169bfa0b02c930076c17bca44d7dfdb754aa38413a67b75fda10ff01ede8748e80
 DIST droidcam-2.0.0.tar.gz 85146 BLAKE2B 95b96e7474ee457589d751caff156f9715f75cab3e54bef151334f8fe6371f5eed919e9a5df050ec683a65f15c2e40a06efc66e80e5323a8b0e6713980c75174 SHA512 68fe4de308df238fc096ad8b658c5d330400113c7ddf54bf0f070c9852e375273f80c7a8293bd9b5e357163305573931c94bb2bd005673086f718121181b2212
 EBUILD droidcam-2.0.0-r1.ebuild 3581 BLAKE2B 252355a8e409d0ada940058ded66a1d1fb19d305a4489b34f29eb204db1c06a02851a4a174d84dbf0eef1cb3e7757c2eacc55a2de26f60df018d80b73fc98d1c SHA512 584ed5cfe390eb1763bb7b3b5e36cbeecff2c770a98da347e346080126dff72350a06cbb5e5ba9b7f5b062ee6b9ca01c9273e046b83ccd179f068d9c996e2d32
diff --git a/media-video/droidcam/files/droidcam-1.8.2_p20220831-makefile-fixes.patch b/media-video/droidcam/files/droidcam-1.8.2_p20220831-makefile-fixes.patch
deleted file mode 100644
index 60454427e41a..000000000000
--- a/media-video/droidcam/files/droidcam-1.8.2_p20220831-makefile-fixes.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b372b09..d18ddba 100644
---- a/Makefile
-+++ b/Makefile
-@@ -11,31 +11,21 @@
- # Example:
- #  APPINDICATOR=ayatana-appindicator3-0.1 make droidcam
- 
--APPINDICATOR ?= appindicator3-0.1
--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 --libs --cflags $(APPINDICATOR)`
-+GTK  += `pkg-config --libs --cflags ayatana-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
- 
--ifneq ($(findstring ayatana,$(APPINDICATOR)),)
--	CFLAGS += -DUSE_AYATANA_APPINDICATOR
--endif
-+CFLAGS += -DUSE_AYATANA_APPINDICATOR
- 
- 
- all: droidcam-cli droidcam
- 
- ifneq "$(RELEASE)" ""
--SRC  += src/libusbmuxd.a src/libxml2.a src/libplist-2.0.a
-+SRC  += src/libusbmuxd-2.0.s0 src/libxml2.so src/libplist-2.0.so
- package: clean all
- 	zip "droidcam_$(RELEASE).zip" \
- 		LICENSE README* icon2.png  \
-@@ -51,11 +41,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) $(CXXFLAGS) $(CPPFLAGS) $(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) $(CXXFLAGS) $(CPPFLAGS) $(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