Date: Friday, October 7, 2022 @ 11:53:59
  Author: heftig
Revision: 457317

2.1.0-3: debug on, fixes, remove libcddb

Modified:
  libcdio/trunk/PKGBUILD

----------+
 PKGBUILD |   38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-07 09:55:11 UTC (rev 457316)
+++ PKGBUILD    2022-10-07 11:53:59 UTC (rev 457317)
@@ -3,36 +3,52 @@
 
 pkgname=libcdio
 pkgver=2.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU Compact Disc Input and Control Library"
 url="https://www.gnu.org/software/libcdio/";
 arch=(x86_64)
 license=(GPL3)
-depends=(libcddb ncurses gcc-libs)
-source=(https://ftp.gnu.org/gnu/libcdio/$pkgname-$pkgver.tar.bz2{,.sig})
-sha256sums=('8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b'
-            'SKIP')
+depends=(ncurses gcc-libs)
+makedepends=(git help2man)
+options=(debug)
+_commit=9c7a2779846da161279bc1501e83c849cf89a594  # tags/release-2.1.0
+source=("git+https://git.savannah.gnu.org/git/libcdio.git#commit=$_commit";)
+sha256sums=('SKIP')
 validpgpkeys=('DAA63BC2582034A02B923D521A8DE5008275EC21') # R. Bernstein
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^release-//;s/[^-]*-g/r&/;s/-/+/g'
+}
+
 prepare() {
-  cd $pkgname-$pkgver
-  autoreconf -fi
+  cd $pkgname
+
+  # Format security
+  git cherry-pick -n 2adb43c60afc6e98e94d86dad9f93d3df52862b1
+
+  # realpath test failure
+  git cherry-pick -n 56335fff0f21d294cd0e478d49542a43e9495ed0
+
+  autoreconf -fvi
 }
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs 
--disable-static
+  cd $pkgname
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-vcd-info --disable-cddb --enable-cpp-progs --disable-static \
+    --enable-maintainer-mode
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 check() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make -C test check
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 
   sed -e "/define CDIO_LIBCDIO_SOURCE_PATH/s|.*|/* #undef 
CDIO_LIBCDIO_SOURCE_PATH */|" \

Reply via email to