haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcdio: bump version

Browse Source
This commit is contained in:
Jerome Duval
2015-02-02 19:25:37 +00:00
parent f949663954
commit 2041b8eecb
2 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dev-libs/libcdio/libcdio-0.92.recipe → dev-libs/libcdio/libcdio-0.93.recipe
View File

@@ -8,13 +8,13 @@ various CD-image formats may benefit from using this library.
LICENSE="GNU GPL v3"
COPYRIGHT="2002-2008,2010,2012, Rocky Bernstein and Herbert Valerio Riedel."
HOMEPAGE="http://www.gnu.org/software/libcdio"
SRC_URI="ftp://ftp.gnu.org/gnu/libcdio/libcdio-0.92.tar.gz"
CHECKSUM_SHA256="3336bf352aff43b5023e41a6d23525172a3b4ee433c467bd0fab5b8becb33fad"
SRC_URI="ftp://ftp.gnu.org/gnu/libcdio/libcdio-$portVersion.tar.gz"
CHECKSUM_SHA256="4972cd22fd8d0e8bff922d35c7a645be0db0ab0e7b3dfaecc9cd8272429d6975"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="libcdio-0.92.patchset"
PATCHES="libcdio-$portVersion.patchset"
PROVIDES="
libcdio$secondaryArchSuffix = $portVersion
@@ -25,9 +25,9 @@ PROVIDES="
cmd:iso_info
cmd:iso_read
cmd:mmc_tool
lib:libcdio$secondaryArchSuffix = 15.0.0 compat >= 15
lib:libcdio$secondaryArchSuffix = 16.0.0 compat >= 16
lib:libcdio++$secondaryArchSuffix = 0.0.2 compat >= 0
lib:libiso9660$secondaryArchSuffix = 9.0.0 compat >= 9
lib:libiso9660$secondaryArchSuffix = 10.0.0 compat >= 10
lib:libiso9660++$secondaryArchSuffix = 0.0.0 compat >= 0
lib:libudf$secondaryArchSuffix = 0.0.0 compat >= 0
"

62
dev-libs/libcdio/patches/libcdio-0.92.patchset → dev-libs/libcdio/patches/libcdio-0.93.patchset
View File

@@ -1,14 +1,14 @@
From dc2241488cbcde1116e7ad346d4e8a93bfe08d21 Mon Sep 17 00:00:00 2001
From 9a833ce6e6201c28fae7e6d8539acfd52eca91c8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 19 Apr 2014 21:36:18 +0000
Subject: gcc2 build fix
diff --git a/configure.ac b/configure.ac
index d83b885..de089f1 100755
index b9b6c67..fe79b04 100755
--- a/configure.ac
+++ b/configure.ac
@@ -241,7 +241,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
@@ -239,7 +239,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
dnl empty_array_size
AC_MSG_CHECKING([how to create empty arrays])
@@ -17,7 +17,7 @@ index d83b885..de089f1 100755
AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="")
if test "x$empty_array_size" = "xxxx"; then
@@ -623,6 +623,7 @@ if test "x$enable_cddb" != "xno"; 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)
@@ -44,12 +44,64 @@ index 29991e7..66b7a67 100644
1.8.3.4
From ccff6bf33b3188cb6e19ab3c6bb6c0f3da2fbf07 Mon Sep 17 00:00:00 2001
From 5a1f12b6d56011b170f1be896d9f13b38ae39755 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
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