Use make flags instead of patching the Makefile

To use shared version of libjpeg-turbo.

Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>

3 files changed, 3 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a290e999ecd..4d550e3cc792 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,11 +13,9 @@ pkgbase = droidcam
 	depends = ffmpeg
 	optdepends = gtk2: use GUI version in addition to CLI interface
 	source = droidcam.desktop
-	source = 0001-Use-shared-version-of-libjpeg-turbo.patch
 	source = droidcam-1.1.zip::https://github.com/aramg/droidcam/archive/v1.1.zip
 	source = droidcam.conf
 	sha512sums = 72d21aa2d7eecc9bb070aaf7059a671246feb22f9c39b934a5463a4839f9347050de00754e5031dbc44f78eb2731f58f0cd2fcf781bc241f6fbd1abb4308b7ee
-	sha512sums = 4ae0849efb8f9183cae75d0ccc1459afe186de6479d47d4634c78c43ab9d92e46bf33d2f68e93134c4d67569cd5421d408013371ad2d5c33d60c0af5de284deb
 	sha512sums = f02a76eb5323b62db9a54107a42e2150e2dfc27ab0acb5600ec0ed09e0512c2b7a21dd2105125d4f4d482348c807bf87f2d96131ce5b46e89d60a3b6f67d3a53
 	sha512sums = ea457b46a2fc9f1a3ea8e99f2cd0771a587cff89f42335fdaf55988dda0376a1fea73b660174c9f1906a304bace68bffec30b70b20dafc05ebae8854d9aadb13
 
diff --git a/0001-Use-shared-version-of-libjpeg-turbo.patch b/0001-Use-shared-version-of-libjpeg-turbo.patch
deleted file mode 100644
index 97d892d99932..000000000000
--- a/0001-Use-shared-version-of-libjpeg-turbo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7796485f7fd696f9e6b78b77eee65fc142be16f0 Mon Sep 17 00:00:00 2001
-From: Mateusz Gozdek <mgozdekof@gmail.com>
-Date: Thu, 28 May 2020 09:32:03 +0200
-Subject: [PATCH] Use shared version of libjpeg-turbo
-
-Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>
----
- linux/Makefile | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git linux/Makefile linux/Makefile
-index 0072361..9ccf019 100644
---- linux/Makefile
-+++ linux/Makefile
-@@ -6,15 +6,11 @@
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- # Use at your own risk. See README file for more details.
- 
--JPEG_DIR ?= /opt/libjpeg-turbo
--JPEG_INCLUDE ?= $(JPEG_DIR)/include
--JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
--
- CC    = -no-pie
- GTK   = `pkg-config --libs --cflags gtk+-2.0` `pkg-config --libs x11`
- 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/adb.c
- NO_WARN  = -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
- 
--- 
-2.26.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 2499ebff0bcc..1caa04d136df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,26 +16,21 @@ makedepends=('gtk2')
 optdepends=('gtk2: use GUI version in addition to CLI interface' )
 
 source=("${pkgname}.desktop"
-        "0001-Use-shared-version-of-libjpeg-turbo.patch"
         "${pkgname}-${pkgver}.zip::https://github.com/aramg/${pkgname}/archive/v${pkgver}.zip"
         "${pkgname}.conf"
 )
 
 sha512sums=('72d21aa2d7eecc9bb070aaf7059a671246feb22f9c39b934a5463a4839f9347050de00754e5031dbc44f78eb2731f58f0cd2fcf781bc241f6fbd1abb4308b7ee'
-            '4ae0849efb8f9183cae75d0ccc1459afe186de6479d47d4634c78c43ab9d92e46bf33d2f68e93134c4d67569cd5421d408013371ad2d5c33d60c0af5de284deb'
             'f02a76eb5323b62db9a54107a42e2150e2dfc27ab0acb5600ec0ed09e0512c2b7a21dd2105125d4f4d482348c807bf87f2d96131ce5b46e89d60a3b6f67d3a53'
             'ea457b46a2fc9f1a3ea8e99f2cd0771a587cff89f42335fdaf55988dda0376a1fea73b660174c9f1906a304bace68bffec30b70b20dafc05ebae8854d9aadb13'
 )
 
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  patch -p0 --input="${srcdir}/0001-Use-shared-version-of-libjpeg-turbo.patch"
-}
-
 build() {
   cd ${pkgname}-${pkgver}/linux
 
-  make
+  # All JPEG* parameters are needed to use shared version of libturbojpeg instead of
+  # static one.
+  make JPEG_DIR="" JPEG_INCLUDE="" JPEG_LIB="" JPEG=$(pkg-config --libs --cflags libturbojpeg)
 }
 
 package() {