February 2015 - MPlayer-dev-eng - lists.mplayerhq.hu

Homepage skin download issue
by Ingo Brückl 09 Sep '15

09 Sep '15

Yesterday, I updated hwswskin to 1.3, but it still isn't downloadable. Is the generation of the skin download tarballs working? Ingo

3 8

[PATCH] configure: remove support for internal libdvd*.
by Reimar Döffinger 04 Jun '15

04 Jun '15

--- configure | 134 +++----------------------------------------------------------- 1 file changed, 6 insertions(+), 128 deletions(-) diff --git a/configure b/configure index ba31428..b27b800 100755 --- a/configure +++ b/configure @@ -359,8 +359,6 @@ Optional features: --disable-bluray disable Blu-ray support [autodetect] --disable-dvdnav disable libdvdnav [autodetect] --disable-dvdread disable libdvdread [autodetect] - --disable-dvdread-internal disable internal libdvdread and libdvdnav [autodetect] - --disable-libdvdcss-internal disable internal libdvdcss [autodetect] --disable-cdparanoia disable cdparanoia [autodetect] --disable-cddb disable cddb [autodetect] --disable-bitmap-font disable bitmap font support [enable] @@ -750,8 +748,6 @@ type dvdnav-config >/dev/null 2>&1 && _dvdnavconfig=dvdnav-config _dvdreadconfig="pkg-config dvdread" type dvdread-config >/dev/null 2>&1 && _dvdnavconfig=dvdread-config _dvdread=auto -_dvdread_internal=auto -_libdvdcss_internal=auto _xanim=auto _real=auto _live=auto @@ -921,11 +917,9 @@ for ac_option do ;; --with-dvdnav-config=*) _dvdnavconfig=$(option_value $ac_option) - _dvdread_internal=no ;; --with-dvdread-config=*) _dvdreadconfig=$(option_value $ac_option) - _dvdread_internal=no ;; --extra-cflags=*) @@ -1170,10 +1164,6 @@ for ac_option do --disable-bluray) _bluray=no ;; --enable-dvdread) _dvdread=yes ;; --disable-dvdread) _dvdread=no ;; - --enable-dvdread-internal) _dvdread_internal=yes ;; - --disable-dvdread-internal) _dvdread_internal=no ;; - --enable-libdvdcss-internal) _libdvdcss_internal=yes ;; - --disable-libdvdcss-internal) _libdvdcss_internal=no ;; --enable-dvdnav) _dvdnav=yes ;; --disable-dvdnav) _dvdnav=no ;; --enable-xanim) _xanim=yes ;; @@ -6086,15 +6076,6 @@ fi echores "$_bluray" echocheck "dvdread" -if test "$_dvdread_internal" = auto ; then - _dvdread_internal=no - if linux || freebsd || netbsd || openbsd || dragonfly || sunos || hpux || - darwin || win32 || os2; then - _dvdread_internal=yes - _dvdread=yes - extra_cflags="-Ilibdvdread4 $extra_cflags" - fi -fi if test "$_dvdread" = auto ; then _dvdread=no if test "$_dl" = yes; then @@ -6104,20 +6085,14 @@ if test "$_dvdread" = auto ; then _dvdread=yes extra_cflags="$extra_cflags $_dvdreadcflags" extra_ldflags="$extra_ldflags $_dvdreadlibs" - res_comment="external" fi fi fi -if test "$_dvdread_internal" = yes; then - def_dvdread='#define CONFIG_DVDREAD 1' - inputmodules="dvdread(internal) $inputmodules" - res_comment="internal" -elif test "$_dvdread" = yes; then +if test "$_dvdread" = yes; then def_dvdread='#define CONFIG_DVDREAD 1' - extra_ldflags="$extra_ldflags -ldvdread" - inputmodules="dvdread(external) $inputmodules" - res_comment="external" + extra_ldflags="$extra_ldflags" + inputmodules="dvdread $inputmodules" else def_dvdread='#undef CONFIG_DVDREAD' noinputmodules="dvdread $noinputmodules" @@ -6125,83 +6100,6 @@ fi echores "$_dvdread" -echocheck "internal libdvdcss" -def_broken_mkdir='#undef HAVE_BROKEN_MKDIR' -def_dvdio='#undef DVD_STRUCT_IN_SYS_DVDIO_H' -def_dvd='#undef DVD_STRUCT_IN_DVD_H' -def_cdio='#undef DVD_STRUCT_IN_SYS_CDIO_H' -def_cdrom='#undef DVD_STRUCT_IN_LINUX_CDROM_H' -def_hpux_scsi_h='#undef HPUX_SCTL_IO' -def_sol_scsi_h='#undef SOLARIS_USCSI' -def_sys_uio_h='#undef HAVE_SYS_UIO_H' -_dvdio=no -_dvd=no -_cdio=no -_cdrom=no -_sol_scsi_h=no -_hpux_scsi_h=no -if test "$_libdvdcss_internal" = auto && test "$_dvdread_internal" = yes ; then - _libdvdcss_internal=no - test -d libdvdcss && _libdvdcss_internal=yes - - if header_check linux/cdrom.h ; then - _cdrom=yes - def_cdrom='#define DVD_STRUCT_IN_LINUX_CDROM_H 1' - # FreeBSD 8.1 has broken dvdio.h - elif header_check_broken sys/types.h sys/dvdio.h ; then - _dvdio=yes - def_dvdio='#define DVD_STRUCT_IN_SYS_DVDIO_H 1' - elif header_check dvd.h ; then - _dvd=yes - def_dvd='#define DVD_STRUCT_IN_DVD_H 1' - # at least OpenSolaris has a broken cdio.h - elif header_check_broken sys/types.h sys/cdio.h ; then - _cdio=yes - def_cdio='#define DVD_STRUCT_IN_SYS_CDIO_H 1' - fi - - if sunos; then - header_check sys/scsi/scsi_types.h && - header_check_broken sys/types.h sys/scsi/impl/uscsi.h && - _sol_scsi_h=yes && def_sol_scsi_h='#define SOLARIS_USCSI 1' - elif hpux; then - # also used by AIX, but AIX does not support VCD and/or libdvdread - header_check sys/scsi.h && _hpux_scsi_h=yes && - def_hpux_scsi_h='#define HPUX_SCTL_IO 1' || - _libdvdcss_internal=no - fi - - statement_check_broken stddef.h sys/stat.h 'mkdir(NULL, 0)' || - def_broken_mkdir='#define HAVE_BROKEN_MKDIR 1' - - header_check "sys/uio.h" && - def_sys_uio_h='#define HAVE_SYS_UIO_H 1' - -fi -if test "$_libdvdcss_internal" = yes ; then - if linux || netbsd || openbsd || wine ; then - def_dvd_linux='#define HAVE_LINUX_DVD_STRUCT 1' - openbsd && def_dvd_openbsd='#define HAVE_OPENBSD_DVD_STRUCT 1' - elif freebsd || dragonfly ; then - def_dvd_bsd='#define HAVE_BSD_DVD_STRUCT 1' - elif darwin ; then - def_dvd_darwin='#define DARWIN_DVD_IOCTL' - extra_ldflags="$extra_ldflags -framework IOKit -framework Carbon" - elif cygwin ; then - cflags_libdvdcss="-D_WIN32_IE=0x0500 -mwin32" - elif mingw32 ; then - cflags_libdvdcss="-D_WIN32_IE=0x0500" - libs_mplayer="$libs_mplayer -lshfolder" - fi - cflags_libdvdcss_dvdread="-Ilibdvdcss" - def_dvdcss="#define HAVE_DVDCSS_DVDCSS_H 1" - inputmodules="libdvdcss(internal) $inputmodules" -else - noinputmodules="libdvdcss(internal) $noinputmodules" -fi -echores "$_libdvdcss_internal" - - echocheck "libcdio" if test "$_libcdio" = auto ; then cat > $TMPC << EOF @@ -8123,22 +8021,7 @@ CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" -# This must be the last test to be performed. Any other tests following it -# could fail due to linker errors. libdvdnavmini is intentionally not linked -# against libdvdread (to permit MPlayer to use its own copy of the library). -# So any compilation using the flags added here but not linking against -# libdvdread can fail. echocheck "DVD support (libdvdnav)" -dvdnav_internal=no -if test "$_dvdnav" = auto ; then - if test "$_dvdread_internal" = yes ; then - _dvdnav=yes - dvdnav_internal=yes - res_comment="internal" - else - $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no - fi -fi if test "$_dvdnav" = auto ; then _dvdnav=no _dvdnavdir=$($_dvdnavconfig --cflags) @@ -8147,14 +8030,9 @@ if test "$_dvdnav" = auto ; then fi if test "$_dvdnav" = yes ; then def_dvdnav='#define CONFIG_DVDNAV 1' - if test "$dvdnav_internal" = yes ; then - cflags_libdvdnav="-Ilibdvdnav" - inputmodules="dvdnav(internal) $inputmodules" - else - extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)" - extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)" - inputmodules="dvdnav $inputmodules" - fi + extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)" + extra_ldflags="$extra_ldflags $($_dvdnavconfig --libs)" + inputmodules="dvdnav $inputmodules" else def_dvdnav='#undef CONFIG_DVDNAV' noinputmodules="dvdnav $noinputmodules" -- 2.1.1

5 12

[PATCH] fix parsing cookies on win32
by Gianluigi Tiesi 28 Mar '15

28 Mar '15

Hi, The cookie parser checks whether the file size is equal to read size, this is not always true on win32 if the cookie file has windows line endings. The parser is kind enough to parse cookies files with windows line endings, but the file should be opened in binary mode or the check will fail. The attached patch fixes the problem. Perhaps please consider to remove the attempt to load cookies from mozilla profile since nowadays paths are different and the cookies are not even in a text file. The function is load_cookies() Regards -- Gianluigi Tiesi <sherpya(a)netfarm.it> EDP Project Leader Netfarm S.r.l. - http://www.netfarm.it/ Free Software: http://oss.netfarm.it/

2 2

Support newer GIFLIB versions - Part 2
by Vicente Olivert Riera 14 Mar '15

14 Mar '15

Support newer GIFLIB versions - Part 2 This patch is necessary because the previous upstream patch is incomplete. Without this one, MPlayer will fail to compile displaying an error message like this one: libvo/vo_gif89a.c: In function 'uninit': libvo/vo_gif89a.c:374:3: error: too few arguments to function 'EGifCloseFile' EGifCloseFile(new_gif); // also frees gif storage space. Signed-off-by: Vicente Olivert Riera <Vincent.Riera(a)imgtec.com> --- diff -rup a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c --- a/libmpdemux/demux_gif.c 2015-02-13 15:39:56.582310414 +0000 +++ b/libmpdemux/demux_gif.c 2015-02-13 15:48:06.396837922 +0000 @@ -48,6 +48,7 @@ typedef struct { #if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5 #define DGifOpen(a, b) DGifOpen(a, b, NULL) #define DGifOpenFileHandle(a) DGifOpenFileHandle(a, NULL) +#define DGifCloseFile(a) DGifCloseFile(a, NULL) #define GifError() (gif ? gif->Error : 0) #define GifErrorString() GifErrorString(gif->Error) #endif diff -rup a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c --- a/libvo/vo_gif89a.c 2015-02-13 15:39:56.631311186 +0000 +++ b/libvo/vo_gif89a.c 2015-02-13 15:45:25.392168294 +0000 @@ -71,6 +71,7 @@ const LIBVO_EXTERN(gif89a) #if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5 #define EGifOpenFileName(a, b) EGifOpenFileName(a, b, NULL) +#define EGifCloseFile(a) EGifCloseFile(a, NULL) #define MakeMapObject GifMakeMapObject #define FreeMapObject GifFreeMapObject #define QuantizeBuffer GifQuantizeBuffer

3 4

[PATCH] mplayer: add the -ass-keep-fonts option.
by Nicolas George 02 Mar '15

02 Mar '15

It is now possible to do: mplayer -ass -ass-keep-fonts fonts.mkv video.mkv and use the fonts attached to the first file to render ASS on the second file. This allows to distribute the fonts once for a series of similar files without requiring to install them on the system, which may be inconvenient for the user. --- DOCS/man/en/mplayer.1 | 8 ++++++++ cfg-common.h | 2 ++ mplayer.c | 2 +- sub/ass_mp.c | 1 + sub/ass_mp.h | 1 + 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 19560c9..2717ad1 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -2484,6 +2484,14 @@ Enables placing toptitles and subtitles in black borders when they are available. . .TP +.B \-ass\-keep\-fonts +Keep fonts that were attached to files and loaded when switching to the next +file. +It allows to use a single dummy video file as an archive for attached fonts +instead of attaching them to all files in a series or installing them on the +system. +. +.TP .B \-dumpjacosub (MPlayer only) Convert the given subtitle (specified with the \-sub option) to the time-based JACOsub subtitle format. diff --git a/cfg-common.h b/cfg-common.h index 58748ff..ac74cc7 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -628,6 +628,8 @@ const m_option_t common_opts[] = { {"ass-border-color", &ass_border_color, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"ass-styles", &ass_styles_file, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"ass-hinting", &ass_hinting, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL}, + {"ass-keep-fonts", &ass_keep_fonts, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"noass-keep-fonts", &ass_keep_fonts, CONF_TYPE_FLAG, 0, 1, 0, NULL}, #endif #ifdef CONFIG_FONTCONFIG {"fontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, -1, 1, NULL}, diff --git a/mplayer.c b/mplayer.c index 482bf53..728f47b 100644 --- a/mplayer.c +++ b/mplayer.c @@ -654,7 +654,7 @@ void uninit_player(unsigned int mask) subdata = NULL; #ifdef CONFIG_ASS ass_track = NULL; - if (ass_library) + if (ass_library && !ass_keep_fonts) ass_clear_fonts(ass_library); #endif } diff --git a/sub/ass_mp.c b/sub/ass_mp.c index 60f464f..8efa243 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -49,6 +49,7 @@ int ass_bottom_margin = 0; int extract_embedded_fonts = 1; char **ass_force_style_list = NULL; int ass_use_margins = 0; +int ass_keep_fonts = 0; char* ass_color = NULL; char* ass_border_color = NULL; char* ass_styles_file = NULL; diff --git a/sub/ass_mp.h b/sub/ass_mp.h index bd4f827..ccce635 100644 --- a/sub/ass_mp.h +++ b/sub/ass_mp.h @@ -40,6 +40,7 @@ extern int ass_bottom_margin; extern int extract_embedded_fonts; extern char **ass_force_style_list; extern int ass_use_margins; +extern int ass_keep_fonts; extern char* ass_color; extern char* ass_border_color; extern char* ass_styles_file; -- 2.1.4

7 13

[PATCH] libvo: implement fs-borders.
by Nicolas George 27 Feb '15

27 Feb '15

Allow to specify extra borders in full screen mode. This is useful if part of the screen is unusuable, for example with a video projector overlapping on the furniture. --- DOCS/man/en/mplayer.1 | 12 ++++++++++++ cfg-mplayer.h | 4 ++++ libvo/video_out.c | 4 ++++ libvo/video_out.h | 4 ++++ libvo/vo_gl.c | 2 ++ libvo/x11_common.c | 21 ++++++++++++++++++++- 6 files changed, 46 insertions(+), 1 deletion(-) I have tried to refactor the geometry computation to get this working with several VOs directly, but it became too many different changes at once. diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 2da668d..19560c9 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3511,6 +3511,18 @@ Fixes fullscreen switching on OpenBox 1.x. .PD 1 . .TP +.B \-fs-border-left <pixels> +.TP +.B \-fs-border-right <pixels> +.TP +.B \-fs-border-top <pixels> +.TP +.B \-fs-border-bottom <pixels> +Specify extra borders in full screen mode. +The borders apply to all displayed elements: video, OSD and EOSD. +The number of pixels is specified in terms of screen resolution. +Currently only supported with by the gl video output driver. +.TP .B \-gamma <\-100\-100> Adjust the gamma of the video signal (default: 0). Not supported by all video output drivers. diff --git a/cfg-mplayer.h b/cfg-mplayer.h index b57ac0d..041361a 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -175,6 +175,10 @@ const m_option_t mplayer_opts[]={ {"panscanrange", &vo_panscanrange, CONF_TYPE_FLOAT, CONF_RANGE, -19.0, 99.0, NULL}, {"border-pos-x", &vo_border_pos_x, CONF_TYPE_FLOAT, CONF_RANGE, -1, 2, NULL}, {"border-pos-y", &vo_border_pos_y, CONF_TYPE_FLOAT, CONF_RANGE, -1, 2, NULL}, + {"fs-border-left", &vo_fs_border_l, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, + {"fs-border-right", &vo_fs_border_r, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, + {"fs-border-top", &vo_fs_border_t, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, + {"fs-border-bottom", &vo_fs_border_b, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, {"monitor-orientation", &vo_rotate, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, {"grabpointer", &vo_grabpointer, CONF_TYPE_FLAG, 0, 0, 1, NULL}, diff --git a/libvo/video_out.c b/libvo/video_out.c index fbf9009..bcf5174 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -67,6 +67,10 @@ int vo_fsmode = 0; float vo_panscan = 0.0f; float vo_border_pos_x = 0.5; float vo_border_pos_y = 0.5; +int vo_fs_border_l = 0; +int vo_fs_border_r = 0; +int vo_fs_border_t = 0; +int vo_fs_border_b = 0; int vo_rotate; int vo_ontop = 0; int vo_adapter_num=0; diff --git a/libvo/video_out.h b/libvo/video_out.h index 712703e..3b9555a 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -233,6 +233,10 @@ extern int vo_fsmode; extern float vo_panscan; extern float vo_border_pos_x; extern float vo_border_pos_y; +extern int vo_fs_border_l; +extern int vo_fs_border_r; +extern int vo_fs_border_t; +extern int vo_fs_border_b; extern int vo_rotate; extern int vo_adapter_num; extern int vo_refresh_rate; diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index ac0cec6..0cef308 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -203,6 +203,8 @@ static void resize(void) { geometry(&left, &top, &w, &h, vo_dwidth, vo_dheight); top = vo_dheight - h - top; mpglViewport(left, top, w, h); + } else if (vo_fs) { + mpglViewport(vo_fs_border_l, vo_fs_border_b, vo_dwidth, vo_dheight); } else mpglViewport(0, 0, vo_dwidth, vo_dheight); diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 151a082..ab3e412 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -963,6 +963,19 @@ int vo_x11_check_events(Display * mydisplay) return ret; } +static void vo_x11_update_fs_borders(void) +{ + if (!vo_fs) + return; + if (vo_dwidth <= vo_fs_border_l + vo_fs_border_r || + vo_dheight <= vo_fs_border_t + vo_fs_border_b) { + mp_msg(MSGT_VO, MSGL_ERR, "[x11] borders too wide, ignored.\n"); + return; + } + vo_dwidth -= vo_fs_border_l + vo_fs_border_r; + vo_dheight -= vo_fs_border_t + vo_fs_border_b; +} + /** * \brief sets the size and position of the non-fullscreen window. */ @@ -1145,6 +1158,7 @@ void vo_x11_create_vo_window(XVisualInfo *vis, int x, int y, vo_fs = 0; vo_dwidth = width; vo_dheight = height; + vo_x11_update_fs_borders(); vo_window = vo_x11_create_smooth_window(mDisplay, mRootWin, vis->visual, x, y, width, height, vis->depth, col_map); window_state = VOFLAG_HIDDEN; @@ -1189,6 +1203,7 @@ void vo_x11_create_vo_window(XVisualInfo *vis, int x, int y, // set the size values right. vo_dwidth = vo_screenwidth; vo_dheight = vo_screenheight; + vo_x11_update_fs_borders(); } final: if (vo_gc != None) @@ -1381,7 +1396,11 @@ int vo_x11_update_geometry(void) { Window dummy_win; XGetGeometry(mDisplay, vo_window, &dummy_win, &dummy_int, &dummy_int, &w, &h, &dummy_int, &depth); - if (w <= INT_MAX && h <= INT_MAX) { vo_dwidth = w; vo_dheight = h; } + if (w <= INT_MAX && h <= INT_MAX) { + vo_dwidth = w; + vo_dheight = h; + vo_x11_update_fs_borders(); + } XTranslateCoordinates(mDisplay, vo_window, mRootWin, 0, 0, &vo_dx, &vo_dy, &dummy_win); -- 2.1.4

2 5

[PATCH 2B/2] af_hrtf: Room acoustics and IIR-based filter
by Yue Shi Lai 18 Feb '15

18 Feb '15

This is the part 2B, the remaining 3 sampling rates of libaf/af_hrtf_kemar.c.

1 0

[PATCH 2A/2] af_hrtf: Room acoustics and IIR-based filter
by Yue Shi Lai 18 Feb '15

18 Feb '15

This is the part 2A, libaf/af_hrtf_kemar.c with the first 3 sampling rates (the remaining are in 2B, meant to be applied on top of this).

1 0

[PATCH 1/2] af_hrtf: Room acoustics and IIR-based filter
by Yue Shi Lai 18 Feb '15

18 Feb '15

Hi, Attached is a patch I would like to submit for discussion, and also because I received request from the FFMPEG side to see this patch. Due to the size of the coefficients, it is split into a 2nd patch. The patch changes the acoustics of af_hrtf to include room acoustics (reflection). In order to be computationally efficient, also the filter code is modified to utilize an IIR filter bank. The filter also automatically accepts the conventional input sampling rates 16, 22.05, 32, 44.1, 48, 96 kHz (though the IIR filter quality degrades when operated at 96 kHz). Basic operation should be very similar in supplying "-af hrtf -channels 8". There are several matrix decoders implemented inside the filter, for convenience, which maybe should be moved into another filter The experimental option "order = 2" is disable due to marginal gains, while requiring 3x the coefficients and therefore quadrupling the size of the patch. Best wishes, Yue Shi Lai

1 0

[PATCH] >=libcdio-0.90 support fix
by ReEkd 15 Feb '15

15 Feb '15

cdda support via libcdio now requires both libcdio and libcdio-paranoia to work due to header location changes, would be nice to have it officialy patched as some have been doing it manually for over two years now (https://github.com/pld-linux/mplayer/blob/master/mplayer-libcdio.patch) Here's a patch tested against the svn version from January: --- configure 2015-01-29 12:32:46.000000000 +0200 +++ configure 2015-01-29 12:46:24.000000000 +0200 @@ -6133,8 +6133,13 @@ cat > $TMPC << EOF #include <stdio.h> #include <cdio/version.h> +#if LIBCDIO_VERSION_NUM >= 90 +#include <cdio/paranoia/cdda.h> +#include <cdio/paranoia/paranoia.h> +#else #include <cdio/cdda.h> #include <cdio/paranoia.h> +#endif int main(void) { void *test = cdda_verbose_set; printf("%s\n", CDIO_VERSION); --- stream/stream_cdda.c 2015-01-29 12:26:40.000000000 +0200 +++ stream/stream_cdda2.c 2015-01-29 13:06:04.000000000 +0200 @@ -21,9 +21,15 @@ #include <cdda_interface.h> #include <cdda_paranoia.h> #else +#include <cdio/version.h> +#if LIBCDIO_VERSION_NUM >= 90 +#include <cdio/paranoia/cdda.h> +#include <cdio/paranoia/paranoia.h> +#else #include <cdio/cdda.h> #include <cdio/paranoia.h> #endif +#endif #include <stdio.h> #include <stdlib.h>

1 0