diff --git a/srcpkgs/cdrdao/patches/fix-lame-bitrate_table.patch b/srcpkgs/cdrdao/patches/fix-lame-bitrate_table.patch deleted file mode 100644 index e1089f94a02..00000000000 --- a/srcpkgs/cdrdao/patches/fix-lame-bitrate_table.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- utils/toc2mp3.cc -+++ utils/toc2mp3.cc -@@ -143,8 +143,8 @@ - - message(0, "LAME encoder version: %s", get_lame_version()); - message(0, "Supported bit rates: "); -- for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) { -- message(0, "%d ", bitrate_table[1][i]); -+ for (int i = 0; i < 16 && lame_get_bitrate(1, i) >= 0; i++) { -+ message(0, "%d ", lame_get_bitrate(1, i)); - } - message(0, ""); - } -@@ -238,8 +238,8 @@ - lame_global_flags *lf; - int bitrateOk = 0; - -- for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) { -- if (bitrate == bitrate_table[1][i]) -+ for (int i = 0; lame_get_bitrate(1, i) >= 0 && !bitrateOk; i++) { -+ if (bitrate == lame_get_bitrate(1, i)) - bitrateOk = 1; - } - diff --git a/srcpkgs/cdrdao/patches/fix-narrowing.patch b/srcpkgs/cdrdao/patches/fix-narrowing.patch deleted file mode 100644 index df55322463a..00000000000 --- a/srcpkgs/cdrdao/patches/fix-narrowing.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- dao/CdrDriver.cc 2009-09-12 18:21:25.000000000 +0200 -+++ dao/CdrDriver.cc 2016-09-13 09:21:23.465964372 +0200 -@@ -495,7 +495,7 @@ - 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0 - }; - --char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 }; -+unsigned char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 }; - - - /* Maps a string to the corresponding driver option value ---- dao/CdrDriver.h 2009-02-21 11:27:31.000000000 +0100 -+++ dao/CdrDriver.h 2016-09-13 09:21:41.068972901 +0200 -@@ -440,7 +440,7 @@ - bool fullBurn_; - - static unsigned char syncPattern[12]; -- static char REMOTE_MSG_SYNC_[4]; -+ static unsigned char REMOTE_MSG_SYNC_[4]; - - static int speed2Mult(int); - static int mult2Speed(int); diff --git a/srcpkgs/cdrdao/patches/fix-stat-includes.patch b/srcpkgs/cdrdao/patches/fix-stat-includes.patch deleted file mode 100644 index c6470dd447f..00000000000 --- a/srcpkgs/cdrdao/patches/fix-stat-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- dao/ScsiIf-linux.cc.orig 2016-04-30 11:38:51.281429655 +0200 -+++ dao/ScsiIf-linux.cc 2016-04-30 11:39:19.146429156 +0200 -@@ -19,6 +19,9 @@ - - #include - -+#include -+#include -+ - #include - #include - #include diff --git a/srcpkgs/cdrdao/template b/srcpkgs/cdrdao/template index df9be733e34..3684d20bb0b 100644 --- a/srcpkgs/cdrdao/template +++ b/srcpkgs/cdrdao/template @@ -1,16 +1,16 @@ # Template file for 'cdrdao' pkgname=cdrdao -version=1.2.3 -revision=3 +version=1.2.4 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="lame-devel libmad-devel libvorbis-devel libao-devel" +makedepends="lame-devel libao-devel libmad-devel libvorbis-devel" short_desc="Records audio or data CD-Rs in disk-at-once (DAO) mode" maintainer="Orphaned " -license="GPL-2" +license="GPL-2..0-or-later" homepage="http://cdrdao.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/cdrdao/cdrdao/1.2.3/cdrdao-1.2.3.tar.bz2" -checksum=8193cb8fa6998ac362c55807e89ad0b3c63edc6b01afaeb3d5042519527fb75e +distfiles="${SOURCEFORGE_SITE}/cdrdao/${version}/cdrdao-${version}.tar.bz2" +checksum=358d9cb83370ceaecdc60564cbf14c2ea2636eac60a966e2461c011ba09853b4 pre_build() { local f