Fix openssl-1.0 dep and -lflite_cmu_us_kal -> -lflite_cmu_us_kal16

3 files changed, 39 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb6b58f73c6f..0993aa27799e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gstreamer0.10-bad
 	pkgver = 0.10.23
-	pkgrel = 36
+	pkgrel = 37
 	url = https://github.com/triceratops1/gstreamer0
 	arch = i686
 	arch = x86_64
@@ -41,6 +41,7 @@ pkgbase = gstreamer0.10-bad
 	makedepends = git
 	makedepends = spandsp
 	makedepends = celt
+	makedepends = openssl-1.0
 	options = !emptydirs
 	source = git+https://gitlab.com/gstreamer-sdk/gst-plugins-bad.git#commit=57569a4854a0f2d14ef19a8264a4ae9a7a1d1125
 	source = fix-libmodplug-include.patch
@@ -49,6 +50,7 @@ pkgbase = gstreamer0.10-bad
 	source = disable-camerabin-test.patch
 	source = faad2-version-check.patch
 	source = wildmidi-0.4.patch
+	source = flite_cmu_us_kal.patch
 	sha256sums = SKIP
 	sha256sums = d89d8f4307c7d5a143b9240467d260a1cb6bb1ab2e7ca57841ce0901f41c9cb7
 	sha256sums = eb97037b7b581d1ab994eadd144044c083975e5670a73ec827de126bf888f4b9
@@ -56,6 +58,7 @@ pkgbase = gstreamer0.10-bad
 	sha256sums = 01e780ddf1f8161a6115dded9dc5bf4bdd4d09a9eee00fa423b1330e90e76c68
 	sha256sums = 741492ae7a9518603fc51d87ae331d882f075547ea7fdec19c60f399085f18cc
 	sha256sums = 7a8698df3b53c34c627c00d3b025045818898cedc5ee7ffa13272d8758fcefd2
+	sha256sums = e3b6a6a8bd0480ab812116cb472b92ad5770fdb8afdbdc2a5b557fdd0294ad36
 
 pkgname = gstreamer0.10-bad
 	pkgdesc = GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)
@@ -96,4 +99,5 @@ pkgname = gstreamer0.10-bad-plugins
 	depends = opus
 	depends = celt
 	depends = spandsp
+	depends = openssl-1.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 96d0fd3fb4ea..283b026924e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,16 @@ pkgbase=gstreamer0.10-bad
 _pkgname=gst-plugins-bad
 pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins')
 pkgver=0.10.23
-pkgrel=36
+pkgrel=37
 arch=('i686' 'x86_64' 'armv7h')
 license=('LGPL' 'GPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36-3' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'faac' 'libmusicbrainz5' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus' 'git' 'spandsp' 'celt')
+makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36-3' 'xvidcore' 'libdca'
+             'bzip2' 'libdc1394' 'neon' 'faac' 'libmusicbrainz5' 'faad2'
+             'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav'
+             'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau'
+             'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump'
+             'libsndfile' 'librsvg' 'wildmidi' 'opus' 'git' 'spandsp' 'celt'
+             'openssl-1.0')
 url="https://github.com/triceratops1/gstreamer0"
 options=(!emptydirs)
 source=("git+https://gitlab.com/gstreamer-sdk/$_pkgname.git#commit=57569a4854a0f2d14ef19a8264a4ae9a7a1d1125"
@@ -17,14 +23,16 @@ source=("git+https://gitlab.com/gstreamer-sdk/$_pkgname.git#commit=57569a4854a0f
         disable-assrender-test.patch
         disable-camerabin-test.patch
         faad2-version-check.patch
-        wildmidi-0.4.patch)
+        wildmidi-0.4.patch
+        flite_cmu_us_kal.patch)
 sha256sums=('SKIP'
             'd89d8f4307c7d5a143b9240467d260a1cb6bb1ab2e7ca57841ce0901f41c9cb7'
             'eb97037b7b581d1ab994eadd144044c083975e5670a73ec827de126bf888f4b9'
             'e66642affa6c0e69837d37615010e67e59ef3d672663303d46c1e2591e2ddfc6'
             '01e780ddf1f8161a6115dded9dc5bf4bdd4d09a9eee00fa423b1330e90e76c68'
             '741492ae7a9518603fc51d87ae331d882f075547ea7fdec19c60f399085f18cc'
-            '7a8698df3b53c34c627c00d3b025045818898cedc5ee7ffa13272d8758fcefd2')
+            '7a8698df3b53c34c627c00d3b025045818898cedc5ee7ffa13272d8758fcefd2'
+            'e3b6a6a8bd0480ab812116cb472b92ad5770fdb8afdbdc2a5b557fdd0294ad36')
 
 prepare() {
   cd $_pkgname
@@ -35,12 +43,14 @@ prepare() {
   patch -Np1 -i ../disable-camerabin-test.patch
   patch -Np1 -i ../faad2-version-check.patch
   patch -Np1 -i ../wildmidi-0.4.patch
+  patch -Np1 -i ../flite_cmu_us_kal.patch
 }
 
 build() {
   cd $_pkgname
   NOCONFIGURE=1 ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  CPPFLAGS=-I/usr/include/openssl-1.0 LDFLAGS=-L/usr/lib/openssl-1.0 \
+    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental --disable-gtk-doc \
     --with-package-name="GStreamer Bad Plugins (Archlinux)" \
     --with-package-origin="http://www.archlinux.org/"
@@ -60,7 +70,12 @@ package_gstreamer0.10-bad() {
 
 package_gstreamer0.10-bad-plugins() {
   pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)"
-  depends=("gstreamer0.10-bad=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'faac' 'libmusicbrainz5' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi' 'opus' 'celt' 'spandsp')
+  depends=("gstreamer0.10-bad=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394'
+          'neon' 'faac' 'libmusicbrainz5' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec'
+          'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa'
+          'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump'
+          'libgme' 'libsndfile' 'librsvg' 'wildmidi' 'opus' 'celt' 'spandsp'
+          'openssl-1.0')
   groups=('gstreamer0.10-plugins')
 
   cd $_pkgname
diff --git a/flite_cmu_us_kal.patch b/flite_cmu_us_kal.patch
new file mode 100644
index 000000000000..e69ee8d732cd
--- /dev/null
+++ b/flite_cmu_us_kal.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 43c9dfa2d..1527534d0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1177,7 +1177,7 @@ dnl *** flite ***
+ translit(dnm, m, l) AM_CONDITIONAL(USE_FLITE, true)
+ AG_GST_CHECK_FEATURE(FLITE, [Flite plugin], flite, [
+   AG_GST_CHECK_LIBHEADER(FLITE, flite, flite_init, $LIBM, flite/flite.h,
+-    FLITE_LIBS="-lflite -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex $LIBM")
++    FLITE_LIBS="-lflite -lflite_cmu_us_kal16 -lflite_usenglish -lflite_cmulex $LIBM")
+ 
+   AC_SUBST(FLITE_CFLAGS)
+   AC_SUBST(FLITE_LIBS)