* [gentoo-commits] gentoo-x86 commit in media-video/libav/files: libav-0.8.5-support-libcdio-paranoia.patch
@ 2013-01-17 10:55 Luca Barbato (lu_zero)
0 siblings, 0 replies; 2+ messages in thread
From: Luca Barbato (lu_zero) @ 2013-01-17 10:55 UTC (permalink / raw
To: gentoo-commits
lu_zero 13/01/17 10:55:55
Added: libav-0.8.5-support-libcdio-paranoia.patch
Log:
Support newer libcdio-paranoia
(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 1191738E)
Revision Changes Path
1.1 media-video/libav/files/libav-0.8.5-support-libcdio-paranoia.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/files/libav-0.8.5-support-libcdio-paranoia.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/files/libav-0.8.5-support-libcdio-paranoia.patch?rev=1.1&content-type=text/plain
Index: libav-0.8.5-support-libcdio-paranoia.patch
===================================================================
diff -urN libav-0.8.5.orig//configure libav-0.8.5/configure
--- libav-0.8.5.orig//configure 2013-01-12 18:00:42.000000000 +0100
+++ libav-0.8.5/configure 2013-01-17 11:43:39.798920861 +0100
@@ -1062,6 +1062,8 @@
asm_mod_y
attribute_may_alias
attribute_packed
+ cdio_paranoia_h
+ cdio_paranoia_paranoia_h
closesocket
cmov
dcbzl
@@ -3020,8 +3022,9 @@
enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
-enabled libcdio &&
- check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open "-lcdio_paranoia -lcdio_cdda -lcdio"
+if enabled libcdio; then
+ check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio || check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
+fi
enabled x11grab &&
check_header X11/Xlib.h &&
diff -urN libav-0.8.5.orig//libavdevice/libcdio.c libav-0.8.5/libavdevice/libcdio.c
--- libav-0.8.5.orig//libavdevice/libcdio.c 2013-01-12 18:00:42.000000000 +0100
+++ libav-0.8.5/libavdevice/libcdio.c 2013-01-17 11:44:28.314919094 +0100
@@ -23,8 +23,15 @@
* libcdio CD grabbing
*/
+#include "config.h"
+
+#if HAVE_CDIO_PARANOIA_H
#include <cdio/cdda.h>
#include <cdio/paranoia.h>
+#elif HAVE_CDIO_PARANOIA_PARANOIA_H
+#include <cdio/paranoia/cdda.h>
+#include <cdio/paranoia/paranoia.h>
+#endif
#include "libavutil/log.h"
#include "libavutil/mem.h"
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/libav/files: libav-0.8.5-support-libcdio-paranoia.patch
@ 2014-10-12 9:13 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2014-10-12 9:13 UTC (permalink / raw
To: gentoo-commits
scarabeus 14/10/12 09:13:48
Removed: libav-0.8.5-support-libcdio-paranoia.patch
Log:
Version bump to latest releases. Provide git ebuild for 11 branch. Remove git for 9 branch. Remove overshadowed stuff. Force due to not-update cvs
(Portage version: 2.2.8-r2/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 8EEE3BE8)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-12 9:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-12 9:13 [gentoo-commits] gentoo-x86 commit in media-video/libav/files: libav-0.8.5-support-libcdio-paranoia.patch Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2013-01-17 10:55 Luca Barbato (lu_zero)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox