diff --git a/dev-libs/libcdio/libcdio-0.93.recipe b/dev-libs/libcdio/libcdio-0.94.recipe similarity index 95% rename from dev-libs/libcdio/libcdio-0.93.recipe rename to dev-libs/libcdio/libcdio-0.94.recipe index 065321773..09d401a93 100644 --- a/dev-libs/libcdio/libcdio-0.93.recipe +++ b/dev-libs/libcdio/libcdio-0.94.recipe @@ -6,9 +6,9 @@ may benefit from using this library." HOMEPAGE="https://www.gnu.org/software/libcdio/" COPYRIGHT="2002-2014 Rocky Bernstein and Herbert Valerio Riedel" LICENSE="GNU GPL v3" -REVISION="4" +REVISION="1" SOURCE_URI="http://ftpmirror.gnu.org/libcdio/libcdio-$portVersion.tar.gz" -CHECKSUM_SHA256="4972cd22fd8d0e8bff922d35c7a645be0db0ab0e7b3dfaecc9cd8272429d6975" +CHECKSUM_SHA256="96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a" PATCHES="libcdio-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -80,6 +80,8 @@ INSTALL() { make install + rm $libDir/lib*.la + if [ -n "$secondaryArchSuffix" ]; then rm -rf $documentationDir $binDir fi diff --git a/dev-libs/libcdio/patches/libcdio-0.93.patchset b/dev-libs/libcdio/patches/libcdio-0.93.patchset deleted file mode 100644 index 9cbaf4117..000000000 --- a/dev-libs/libcdio/patches/libcdio-0.93.patchset +++ /dev/null @@ -1,131 +0,0 @@ -From 9a833ce6e6201c28fae7e6d8539acfd52eca91c8 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 19 Apr 2014 21:36:18 +0000 -Subject: gcc2 build fix - - -diff --git a/configure.ac b/configure.ac -index b9b6c67..fe79b04 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -239,7 +239,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ - dnl empty_array_size - AC_MSG_CHECKING([how to create empty arrays]) - --empty_array_size="xxxx" -+empty_array_size="xxx" - AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="") - - if test "x$empty_array_size" = "xxxx"; then -@@ -621,6 +621,7 @@ if test "x$enable_cddb" != "xno"; then - [AC_MSG_WARN([new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net]) - HAVE_CDDB=no]) - AC_CHECK_LIB(socket, connect) -+ AC_CHECK_LIB(network, connect) - AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname)) - fi - -diff --git a/example/mmc1.c b/example/mmc1.c -index 29991e7..66b7a67 100644 ---- a/example/mmc1.c -+++ b/example/mmc1.c -@@ -90,9 +90,9 @@ main(int argc, const char *argv[]) - { - driver_return_code_t i_status; - bool b_erasable; -+ cdio_mmc_feature_profile_t disctype; - - i_status = mmc_get_disc_erasable(p_cdio, &b_erasable); -- cdio_mmc_feature_profile_t disctype; - if (DRIVER_OP_SUCCESS == i_status) - printf("-- Disc is %serasable.\n", b_erasable ? "" : "not "); - else --- -1.8.3.4 - - -From 5a1f12b6d56011b170f1be896d9f13b38ae39755 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Fri, 12 Sep 2014 11:36:35 +0200 -Subject: Fix tests for gcc2. - - -diff --git a/lib/driver/abs_path.c b/lib/driver/abs_path.c -index 6654ec7..fb198b1 100644 ---- a/lib/driver/abs_path.c -+++ b/lib/driver/abs_path.c -@@ -108,10 +108,12 @@ cdio_dirname(const char *fname) - char * - cdio_abspath(const char *cwd, const char *fname) - { -+ size_t len; -+ char* result; - if (isdirsep(*fname)) return strdup(fname); - -- size_t len = strlen(cwd) + strlen(fname) + 2; -- char* result = calloc(sizeof(char), len); -+ len = strlen(cwd) + strlen(fname) + 2; -+ result = calloc(sizeof(char), len); - snprintf(result, len, "%s%c%s", - cwd, CDIO_FILE_SEPARATOR, fname); - return result; -diff --git a/src/getopt.c b/src/getopt.c -index 80c7cb2..d728d43 100755 ---- a/src/getopt.c -+++ b/src/getopt.c -@@ -398,6 +398,13 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, - int long_only, struct _getopt_data *d, int posixly_correct) - { - int print_errors = d->opterr; -+ char *nameend; -+ const struct option *p; -+ const struct option *pfound = NULL; -+ int exact = 0; -+ int ambig = 0; -+ int indfound = 0; -+ int option_index; - - if (argc < 1) - return -1; -@@ -877,14 +884,6 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring, - if (longopts == NULL) - goto no_longs; - -- char *nameend; -- const struct option *p; -- const struct option *pfound = NULL; -- int exact = 0; -- int ambig = 0; -- int indfound = 0; -- int option_index; -- - /* This is an option that requires an argument. */ - if (*d->__nextchar != '\0') - { -diff --git a/test/driver/bincue.c b/test/driver/bincue.c -index de64dce..7ed1ee8 100644 ---- a/test/driver/bincue.c -+++ b/test/driver/bincue.c -@@ -45,7 +45,7 @@ - #include "helper.h" - - #ifndef DATA_DIR --#define DATA_DIR "/src/external-vcs/savannah/libcdio/test/data" -+#define DATA_DIR "/sources/libcdio-0.92/test/data" - #endif - - #define NUM_GOOD_CUES 2 -@@ -117,9 +117,9 @@ main(int argc, const char *argv[]) - if (!p_cdio) { - printf("Can't open cdda.cue\n"); - } else { -+ char *psz_device; - /* Just test performing some operations. */ - cdio_set_blocksize(p_cdio, 2048); -- char *psz_device; - - #ifdef HAVE_CHDIR - if (0 == chdir(DATA_DIR)) --- -1.8.3.4 - diff --git a/dev-libs/libcdio/patches/libcdio-0.94.patchset b/dev-libs/libcdio/patches/libcdio-0.94.patchset new file mode 100644 index 000000000..9035d9c13 --- /dev/null +++ b/dev-libs/libcdio/patches/libcdio-0.94.patchset @@ -0,0 +1,74 @@ +From 3462988a94857e046cf0dc09e4fbeb6661457fa0 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 19 Apr 2014 21:36:18 +0000 +Subject: gcc2 build fix + + +diff --git a/configure.ac b/configure.ac +index 24e1698..6095b44 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -255,7 +255,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ + dnl empty_array_size + AC_MSG_CHECKING([how to create empty arrays]) + +-empty_array_size="xxxx" ++empty_array_size="xxx" + AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="") + + if test "x$empty_array_size" = "xxxx"; then +@@ -636,6 +636,7 @@ if test "x$enable_cddb" != "xno"; then + [AC_MSG_WARN([new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net]) + HAVE_CDDB=no]) + AC_CHECK_LIB(socket, connect) ++ AC_CHECK_LIB(network, connect) + AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname)) + fi + +diff --git a/example/mmc1.c b/example/mmc1.c +index 29991e7..66b7a67 100644 +--- a/example/mmc1.c ++++ b/example/mmc1.c +@@ -90,9 +90,9 @@ main(int argc, const char *argv[]) + { + driver_return_code_t i_status; + bool b_erasable; ++ cdio_mmc_feature_profile_t disctype; + + i_status = mmc_get_disc_erasable(p_cdio, &b_erasable); +- cdio_mmc_feature_profile_t disctype; + if (DRIVER_OP_SUCCESS == i_status) + printf("-- Disc is %serasable.\n", b_erasable ? "" : "not "); + else +-- +2.13.1 + + +From 9d12e524359efaa19db8bd35a2ea0fc652104115 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Fri, 12 Sep 2014 11:36:35 +0200 +Subject: Fix tests for gcc2. + + +diff --git a/lib/driver/abs_path.c b/lib/driver/abs_path.c +index 235c5b4..f329f82 100644 +--- a/lib/driver/abs_path.c ++++ b/lib/driver/abs_path.c +@@ -93,10 +93,12 @@ cdio_dirname(const char *fname) + char * + cdio_abspath(const char *cwd, const char *fname) + { ++ size_t len; ++ char* result; + if (isdirsep(*fname)) return strdup(fname); + +- size_t len = strlen(cwd) + strlen(fname) + 2; +- char* result = calloc(sizeof(char), len); ++ len = strlen(cwd) + strlen(fname) + 2; ++ result = calloc(sizeof(char), len); + snprintf(result, len, "%s%c%s", + cwd, CDIO_FILE_SEPARATOR, fname); + return result; +-- +2.13.1 +