Update to 0.2.0-3

3 files changed, 41 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e24dbe2d5ea..8d306b300302 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = libbdplus
 	pkgdesc = Library for handling the BD+ protection scheme on bluray discs
 	pkgver = 0.2.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.videolan.org/developers/libbdplus.html
 	arch = i686
 	arch = x86_64
 	license = LGPL
 	depends = libaacs>=0.7.0
 	source = ftp://ftp.videolan.org/pub/videolan/libbdplus/0.2.0/libbdplus-0.2.0.tar.bz2
+	source = gcrypt.diff
 	sha256sums = b93eea3eaef33d6e9155d2c34b068c505493aa5a4936e63274f4342ab0f40a58
+	sha256sums = dbb9aa44fe544dea398f8eb144783794127593126427b7eb49a3850721018d9f
 
 pkgname = libbdplus
diff --git a/PKGBUILD b/PKGBUILD
index ef7ca9a03121..def06d369c32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,19 @@
 # Maintainer: Connor Behan <connor.behan@gmail.com>
 pkgname=libbdplus
 pkgver=0.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for handling the BD+ protection scheme on bluray discs"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="https://www.videolan.org/developers/libbdplus.html"
 depends=('libaacs>=0.7.0')
-source=("ftp://ftp.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+source=("ftp://ftp.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        "gcrypt.diff")
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+        patch -Np1 -i ../gcrypt.diff
+        ./bootstrap
         # https://www.mail-archive.com/bug-autoconf@gnu.org/msg04648.html
 	./configure --prefix=/usr --with-gpg-error-prefix=/usr
 	make
@@ -20,4 +23,5 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 }
-sha256sums=('b93eea3eaef33d6e9155d2c34b068c505493aa5a4936e63274f4342ab0f40a58')
+sha256sums=('b93eea3eaef33d6e9155d2c34b068c505493aa5a4936e63274f4342ab0f40a58'
+            'dbb9aa44fe544dea398f8eb144783794127593126427b7eb49a3850721018d9f')
diff --git a/gcrypt.diff b/gcrypt.diff
new file mode 100644
index 000000000000..1b4ebca9440e
--- /dev/null
+++ b/gcrypt.diff
@@ -0,0 +1,31 @@
+diff -ru libbdplus-0.2.0.orig/configure.ac libbdplus-0.2.0/configure.ac
+--- libbdplus-0.2.0.orig/configure.ac	2024-06-25 11:09:23.266636039 -0300
++++ libbdplus-0.2.0/configure.ac	2024-06-25 11:16:14.246607863 -0300
+@@ -109,26 +109,7 @@
+ ])
+ 
+ dnl gcrypt check
+-
+-AC_ARG_WITH(libgcrypt-prefix,
+-            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
+-                           [prefix where libgcrypt is installed (optional)]),
+-     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
+-if test x$libgcrypt_config_prefix != x ; then
+-   if test x${LIBGCRYPT_CONFIG+set} != xset ; then
+-      LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
+-   fi
+-fi
+-
+-AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+-if test x"$LIBGCRYPT_CONFIG" = xno; then
+-  AC_MSG_ERROR([libgcrypt not found on system])
+-else
+-  LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
+-  LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+-  AC_SUBST(LIBGCRYPT_CFLAGS)
+-  AC_SUBST(LIBGCRYPT_LIBS)
+-fi
++PKG_CHECK_MODULES([LIBGCRYPT], [libgcrypt])
+ AC_FUNC_STRERROR_R
+ 
+ dnl use re-entrant version of gcrypt_error() from gpg-error