diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-02-12 03:44:29 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-02-12 03:44:29 +0000 |
| commit | 09bee2cba5473ea377109c02cebccffd3df95b30 (patch) | |
| tree | 82737bc09c99dfbf36d3f46744e0a9aa19f94977 /dev-libs/libcdio/files | |
| parent | Stable on amd64. (diff) | |
| download | gentoo-2-09bee2cba5473ea377109c02cebccffd3df95b30.tar.gz gentoo-2-09bee2cba5473ea377109c02cebccffd3df95b30.tar.bz2 gentoo-2-09bee2cba5473ea377109c02cebccffd3df95b30.zip | |
Add patches to fix a crash within nrg driver and to support DragonFly BSD if that will ever be needed.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'dev-libs/libcdio/files')
| -rw-r--r-- | dev-libs/libcdio/files/digest-libcdio-0.76-r1 | 3 | ||||
| -rw-r--r-- | dev-libs/libcdio/files/libcdio-0.76-dragonfly.patch | 13 | ||||
| -rw-r--r-- | dev-libs/libcdio/files/libcdio-0.76-nrg-crash.patch | 31 |
3 files changed, 47 insertions, 0 deletions
diff --git a/dev-libs/libcdio/files/digest-libcdio-0.76-r1 b/dev-libs/libcdio/files/digest-libcdio-0.76-r1 new file mode 100644 index 000000000000..da324353d3eb --- /dev/null +++ b/dev-libs/libcdio/files/digest-libcdio-0.76-r1 @@ -0,0 +1,3 @@ +MD5 6d5f97847c8be003f4018dd2b5afe23d libcdio-0.76.tar.gz 1821519 +RMD160 3ebce21179c04c5a8d721d485a28244de9ac82f3 libcdio-0.76.tar.gz 1821519 +SHA256 26e0d08f345de365492671703a597be2c7275885e1aeb6f9fee049725caaf04a libcdio-0.76.tar.gz 1821519 diff --git a/dev-libs/libcdio/files/libcdio-0.76-dragonfly.patch b/dev-libs/libcdio/files/libcdio-0.76-dragonfly.patch new file mode 100644 index 000000000000..0baf213319e2 --- /dev/null +++ b/dev-libs/libcdio/files/libcdio-0.76-dragonfly.patch @@ -0,0 +1,13 @@ +Index: libcdio-0.76/configure.ac +=================================================================== +--- libcdio-0.76.orig/configure.ac ++++ libcdio-0.76/configure.ac +@@ -436,7 +436,7 @@ int has_timeout=sizeof(test.timeout);], + LIBS="$LIBS -lwinmm -mwindows" + cd_drivers="${cd_drivers}, MinGW " + ;; +- freebsd4.*|freebsd5.*|freebsd6*) ++ freebsd4.*|freebsd5.*|freebsd6*|dragonfly*) + AC_DEFINE([HAVE_FREEBSD_CDROM], [1], + [Define 1 if you have FreeBSD CD-ROM support]) + LIBS="$LIBS -lcam" diff --git a/dev-libs/libcdio/files/libcdio-0.76-nrg-crash.patch b/dev-libs/libcdio/files/libcdio-0.76-nrg-crash.patch new file mode 100644 index 000000000000..7de78275904d --- /dev/null +++ b/dev-libs/libcdio/files/libcdio-0.76-nrg-crash.patch @@ -0,0 +1,31 @@ +Index: libcdio-0.76/lib/driver/image/nrg.c +=================================================================== +--- libcdio-0.76.orig/lib/driver/image/nrg.c ++++ libcdio-0.76/lib/driver/image/nrg.c +@@ -1173,21 +1173,14 @@ _get_track_green_nrg(void *p_user_data, + bool + cdio_is_nrg(const char *psz_nrg) + { +- unsigned int i; ++ size_t psz_len; + + if (psz_nrg == NULL) return false; ++ psz_len = strlen(psz_nrg); ++ /* At least 4 characters needed for .nrg extension */ ++ if ( psz_len < 4 ) return false; + +- i=strlen(psz_nrg)-strlen("nrg"); +- +- if (i>0) { +- if (psz_nrg[i]=='n' && psz_nrg[i+1]=='r' && psz_nrg[i+2]=='g') { +- return true; +- } +- else if (psz_nrg[i]=='N' && psz_nrg[i+1]=='R' && psz_nrg[i+2]=='G') { +- return true; +- } +- } +- return false; ++ return strncasecmp( psz_nrg+(psz_len-3), "nrg", 3 ) == 0; + } + + /*! |