Simple update libcdio-2.2.0. Tested with all consumers on amd64. OK?
Cheers Rafael
diff --git a/audio/libcdio/Makefile b/audio/libcdio/Makefile
index c2cd423fdf7..f106b3457d2 100644
--- a/audio/libcdio/Makefile
+++ b/audio/libcdio/Makefile
@@ -1,14 +1,16 @@
COMMENT= compact disk input and control library
-DISTNAME= libcdio-2.1.0
-EXTRACT_SUFX= .tar.bz2
+V= 2.2.0
+DISTNAME= libcdio-${V}
CATEGORIES= audio devel
-SITES= ${SITE_GNU:=libcdio/}
+
+SITES= https://github.com/libcdio/libcdio/releases/download/${V}0/
+EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= cdio 1.0 \
cdio++ 1.0 \
- iso9660 1.0 \
+ iso9660 2.0 \
iso9660++ 1.0 \
udf 1.0
diff --git a/audio/libcdio/distinfo b/audio/libcdio/distinfo
index 0e1536f36b4..f3e0df175d2 100644
--- a/audio/libcdio/distinfo
+++ b/audio/libcdio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libcdio-2.1.0.tar.bz2) = hVDpWJ29WUv6yTuB7PEpsdydDVHpD5aW8bL5sq8ycSs=
-SIZE (libcdio-2.1.0.tar.bz2) = 1759040
+SHA256 (libcdio-2.2.0.tar.bz2) = b4+99NGJz2Pyp6FUnFFs1yDHsiLHqq28kkom50WkhTk=
+SIZE (libcdio-2.2.0.tar.bz2) = 1729378
diff --git a/audio/libcdio/patches/patch-configure
b/audio/libcdio/patches/patch-configure
deleted file mode 100644
index 89bd929bf1b..00000000000
--- a/audio/libcdio/patches/patch-configure
+++ /dev/null
@@ -1,16 +0,0 @@
-Re-enable cdda_player.
-
-Already applied upstream:
-http://git.savannah.gnu.org/cgit/libcdio.git/commit/?id=3c1eff03a256ab47bb79f439bfc478664e3fe917
-
-Index: configure
---- configure.orig
-+++ configure
-@@ -18229,7 +18229,6 @@ $as_echo "#define HAVE_NETBSD_CDROM 1" >>confdefs.h
-
- # LIBS="$LIBS -lcam"
- cd_drivers="${cd_drivers}, NetBSD "
-- enable_cdda_player="no"
- ;;
- os2*)
-
diff --git a/audio/libcdio/pkg/PLIST b/audio/libcdio/pkg/PLIST
index 0b96d9d43bd..3f6476e590f 100644
--- a/audio/libcdio/pkg/PLIST
+++ b/audio/libcdio/pkg/PLIST
@@ -51,19 +51,19 @@ include/cdio/util.h
include/cdio/version.h
include/cdio/xa.h
@info info/libcdio.info
-lib/libcdio++.a
+@static-lib lib/libcdio++.a
lib/libcdio++.la
@lib lib/libcdio++.so.${LIBcdio++_VERSION}
-lib/libcdio.a
+@static-lib lib/libcdio.a
lib/libcdio.la
@lib lib/libcdio.so.${LIBcdio_VERSION}
-lib/libiso9660++.a
+@static-lib lib/libiso9660++.a
lib/libiso9660++.la
@lib lib/libiso9660++.so.${LIBiso9660++_VERSION}
-lib/libiso9660.a
+@static-lib lib/libiso9660.a
lib/libiso9660.la
@lib lib/libiso9660.so.${LIBiso9660_VERSION}
-lib/libudf.a
+@static-lib lib/libudf.a
lib/libudf.la
@lib lib/libudf.so.${LIBudf_VERSION}
lib/pkgconfig/libcdio++.pc
