Package: xine-lib Version: 1.1.21-1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for xine-lib (versioned as 1.1.21-1.1) and uploaded it to DELAYED/02. Please feel free to tell me if I should delay it longer. Cheers Luk
diff -Nru xine-lib-1.1.21/debian/changelog xine-lib-1.1.21/debian/changelog --- xine-lib-1.1.21/debian/changelog 2012-06-09 22:59:42.000000000 +0200 +++ xine-lib-1.1.21/debian/changelog 2013-09-14 17:36:51.000000000 +0200 @@ -1,3 +1,11 @@ +xine-lib (1.1.21-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Add Ubuntu's patch to fix FTBFS with libav9 (Closes:#693106). + * Drop libmodplug-dev build dependency (Closes: #696684). + + -- Luk Claes <l...@debian.org> Mon, 09 Sep 2013 08:31:57 +0200 + xine-lib (1.1.21-1) unstable; urgency=low * New upstream release. diff -Nru xine-lib-1.1.21/debian/control xine-lib-1.1.21/debian/control --- xine-lib-1.1.21/debian/control 2012-06-09 20:46:29.000000000 +0200 +++ xine-lib-1.1.21/debian/control 2013-09-14 17:35:45.000000000 +0200 @@ -12,7 +12,7 @@ libasound2-dev [linux-any], libv4l-dev [linux-any], libcam-dev [kfreebsd-any], - libaa1-dev, libcaca-dev, libmodplug-dev, libpulse-dev, + libaa1-dev, libcaca-dev, libpulse-dev, graphicsmagick-libmagick-dev-compat, libpng-dev, libfreetype6-dev, libogg-dev, libvorbis-dev, libtheora-dev, diff -Nru xine-lib-1.1.21/debian/patches/debian-changes xine-lib-1.1.21/debian/patches/debian-changes --- xine-lib-1.1.21/debian/patches/debian-changes 1970-01-01 01:00:00.000000000 +0100 +++ xine-lib-1.1.21/debian/patches/debian-changes 2013-09-14 17:37:13.000000000 +0200 @@ -0,0 +1,506 @@ +Origin: upstream, other, * +Description: Applied patches. See Vcs-* headers in debian/control. + +--- /dev/null ++++ xine-lib-1.1.21/po/Makevars.extra +@@ -0,0 +1,4 @@ ++# Extra file just to get LIBNAME correctly. ++# Unfortunate but it's the only way to avoid changing po/Makefile.in.in ++ ++LIBNAME = libxine1 +--- /dev/null ++++ xine-lib-1.1.21/src/libffmpeg/ffmpeg_config.h +@@ -0,0 +1,493 @@ ++/* Automatically generated */ ++#define CONFIG_AASC_DECODER 1 ++#define ENABLE_AASC_DECODER 1 ++#define CONFIG_ASV1_DECODER 1 ++#define ENABLE_ASV1_DECODER 1 ++#define CONFIG_ASV2_DECODER 1 ++#define ENABLE_ASV2_DECODER 1 ++#define CONFIG_AVS_DECODER 1 ++#define ENABLE_AVS_DECODER 1 ++#define CONFIG_CSCD_DECODER 1 ++#define ENABLE_CSCD_DECODER 1 ++#define CONFIG_CYUV_DECODER 1 ++#define ENABLE_CYUV_DECODER 1 ++#define CONFIG_DVVIDEO_DECODER 1 ++#define ENABLE_DVVIDEO_DECODER 1 ++#define CONFIG_EIGHTBPS_DECODER 1 ++#define ENABLE_EIGHTBPS_DECODER 1 ++#define CONFIG_FLIC_DECODER 1 ++#define ENABLE_FLIC_DECODER 1 ++#define CONFIG_FLV_DECODER 1 ++#define ENABLE_FLV_DECODER 1 ++#define CONFIG_FOURXM_DECODER 1 ++#define ENABLE_FOURXM_DECODER 1 ++#define CONFIG_FRAPS_DECODER 1 ++#define ENABLE_FRAPS_DECODER 1 ++#define CONFIG_HUFFYUV_DECODER 1 ++#define ENABLE_HUFFYUV_DECODER 1 ++#define CONFIG_IDCIN_DECODER 1 ++#define ENABLE_IDCIN_DECODER 1 ++#define CONFIG_INTERPLAY_VIDEO_DECODER 1 ++#define ENABLE_INTERPLAY_VIDEO_DECODER 1 ++#define CONFIG_KMVC_DECODER 1 ++#define ENABLE_KMVC_DECODER 1 ++#define CONFIG_LOCO_DECODER 1 ++#define ENABLE_LOCO_DECODER 1 ++#define CONFIG_MMVIDEO_DECODER 1 ++#define ENABLE_MMVIDEO_DECODER 1 ++#define CONFIG_NUV_DECODER 1 ++#define ENABLE_NUV_DECODER 1 ++#define CONFIG_QDRAW_DECODER 1 ++#define ENABLE_QDRAW_DECODER 1 ++#define CONFIG_QPEG_DECODER 1 ++#define ENABLE_QPEG_DECODER 1 ++#define CONFIG_ROQ_DECODER 1 ++#define ENABLE_ROQ_DECODER 1 ++#define CONFIG_RPZA_DECODER 1 ++#define ENABLE_RPZA_DECODER 1 ++#define CONFIG_SMACKER_DECODER 1 ++#define ENABLE_SMACKER_DECODER 1 ++#define CONFIG_SMC_DECODER 1 ++#define ENABLE_SMC_DECODER 1 ++#define CONFIG_SNOW_DECODER 1 ++#define ENABLE_SNOW_DECODER 1 ++#define CONFIG_TRUEMOTION1_DECODER 1 ++#define ENABLE_TRUEMOTION1_DECODER 1 ++#define CONFIG_TRUEMOTION2_DECODER 1 ++#define ENABLE_TRUEMOTION2_DECODER 1 ++#define CONFIG_TSCC_DECODER 1 ++#define ENABLE_TSCC_DECODER 1 ++#define CONFIG_ULTI_DECODER 1 ++#define ENABLE_ULTI_DECODER 1 ++#define CONFIG_VCR1_DECODER 1 ++#define ENABLE_VCR1_DECODER 1 ++#define CONFIG_VMDVIDEO_DECODER 1 ++#define ENABLE_VMDVIDEO_DECODER 1 ++#define CONFIG_WNV1_DECODER 1 ++#define ENABLE_WNV1_DECODER 1 ++#define CONFIG_XAN_WC3_DECODER 1 ++#define ENABLE_XAN_WC3_DECODER 1 ++#define CONFIG_XL_DECODER 1 ++#define ENABLE_XL_DECODER 1 ++#define CONFIG_ZMBV_DECODER 1 ++#define ENABLE_ZMBV_DECODER 1 ++#define CONFIG_ALAC_DECODER 1 ++#define ENABLE_ALAC_DECODER 1 ++#define CONFIG_AMR_NB_DECODER 1 ++#define ENABLE_AMR_NB_DECODER 1 ++#define CONFIG_AMR_WB_DECODER 1 ++#define ENABLE_AMR_WB_DECODER 1 ++#define CONFIG_LIBGSM_DECODER 1 ++#define ENABLE_LIBGSM_DECODER 1 ++#define CONFIG_MACE3_DECODER 1 ++#define ENABLE_MACE3_DECODER 1 ++#define CONFIG_MACE6_DECODER 1 ++#define ENABLE_MACE6_DECODER 1 ++#define CONFIG_SHORTEN_DECODER 1 ++#define ENABLE_SHORTEN_DECODER 1 ++#define CONFIG_SMACKAUD_DECODER 1 ++#define ENABLE_SMACKAUD_DECODER 1 ++#define CONFIG_TRUESPEECH_DECODER 1 ++#define ENABLE_TRUESPEECH_DECODER 1 ++#define CONFIG_TTA_DECODER 1 ++#define ENABLE_TTA_DECODER 1 ++#define CONFIG_VMDAUDIO_DECODER 1 ++#define ENABLE_VMDAUDIO_DECODER 1 ++#define CONFIG_PCM_ALAW_DECODER 1 ++#define ENABLE_PCM_ALAW_DECODER 1 ++#define CONFIG_PCM_MULAW_DECODER 1 ++#define ENABLE_PCM_MULAW_DECODER 1 ++#define CONFIG_PCM_S8_DECODER 1 ++#define ENABLE_PCM_S8_DECODER 1 ++#define CONFIG_PCM_S16BE_DECODER 1 ++#define ENABLE_PCM_S16BE_DECODER 1 ++#define CONFIG_PCM_S16LE_DECODER 1 ++#define ENABLE_PCM_S16LE_DECODER 1 ++#define CONFIG_PCM_S24BE_DECODER 1 ++#define ENABLE_PCM_S24BE_DECODER 1 ++#define CONFIG_PCM_S24DAUD_DECODER 1 ++#define ENABLE_PCM_S24DAUD_DECODER 1 ++#define CONFIG_PCM_S24LE_DECODER 1 ++#define ENABLE_PCM_S24LE_DECODER 1 ++#define CONFIG_PCM_S32BE_DECODER 1 ++#define ENABLE_PCM_S32BE_DECODER 1 ++#define CONFIG_PCM_S32LE_DECODER 1 ++#define ENABLE_PCM_S32LE_DECODER 1 ++#define CONFIG_PCM_U8_DECODER 1 ++#define ENABLE_PCM_U8_DECODER 1 ++#define CONFIG_PCM_U16BE_DECODER 1 ++#define ENABLE_PCM_U16BE_DECODER 1 ++#define CONFIG_PCM_U16LE_DECODER 1 ++#define ENABLE_PCM_U16LE_DECODER 1 ++#define CONFIG_PCM_U24BE_DECODER 1 ++#define ENABLE_PCM_U24BE_DECODER 1 ++#define CONFIG_PCM_U24LE_DECODER 1 ++#define ENABLE_PCM_U24LE_DECODER 1 ++#define CONFIG_PCM_U32BE_DECODER 1 ++#define ENABLE_PCM_U32BE_DECODER 1 ++#define CONFIG_PCM_U32LE_DECODER 1 ++#define ENABLE_PCM_U32LE_DECODER 1 ++#define CONFIG_INTERPLAY_DPCM_DECODER 1 ++#define ENABLE_INTERPLAY_DPCM_DECODER 1 ++#define CONFIG_ROQ_DPCM_DECODER 1 ++#define ENABLE_ROQ_DPCM_DECODER 1 ++#define CONFIG_SOL_DPCM_DECODER 1 ++#define ENABLE_SOL_DPCM_DECODER 1 ++#define CONFIG_VQA_DECODER 1 ++#define ENABLE_VQA_DECODER 1 ++#define CONFIG_XAN_DPCM_DECODER 1 ++#define ENABLE_XAN_DPCM_DECODER 1 ++#define CONFIG_ADPCM_4XM_DECODER 1 ++#define ENABLE_ADPCM_4XM_DECODER 1 ++#define CONFIG_ADPCM_CT_DECODER 1 ++#define ENABLE_ADPCM_CT_DECODER 1 ++#define CONFIG_ADPCM_EA_DECODER 1 ++#define ENABLE_ADPCM_EA_DECODER 1 ++#define CONFIG_ADPCM_IMA_DK3_DECODER 1 ++#define ENABLE_ADPCM_IMA_DK3_DECODER 1 ++#define CONFIG_ADPCM_IMA_DK4_DECODER 1 ++#define ENABLE_ADPCM_IMA_DK4_DECODER 1 ++#define CONFIG_ADPCM_IMA_QT_DECODER 1 ++#define ENABLE_ADPCM_IMA_QT_DECODER 1 ++#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 1 ++#define ENABLE_ADPCM_IMA_SMJPEG_DECODER 1 ++#define CONFIG_ADPCM_IMA_WAV_DECODER 1 ++#define ENABLE_ADPCM_IMA_WAV_DECODER 1 ++#define CONFIG_ADPCM_IMA_WS_DECODER 1 ++#define ENABLE_ADPCM_IMA_WS_DECODER 1 ++#define CONFIG_ADPCM_MS_DECODER 1 ++#define ENABLE_ADPCM_MS_DECODER 1 ++#define CONFIG_ADPCM_SBPRO_2_DECODER 1 ++#define ENABLE_ADPCM_SBPRO_2_DECODER 1 ++#define CONFIG_ADPCM_SBPRO_3_DECODER 1 ++#define ENABLE_ADPCM_SBPRO_3_DECODER 1 ++#define CONFIG_ADPCM_SBPRO_4_DECODER 1 ++#define ENABLE_ADPCM_SBPRO_4_DECODER 1 ++#define CONFIG_ADPCM_XA_DECODER 1 ++#define ENABLE_ADPCM_XA_DECODER 1 ++#define CONFIG_ADPCM_YAMAHA_DECODER 1 ++#define ENABLE_ADPCM_YAMAHA_DECODER 1 ++#define CONFIG_CINEPAK_DECODER 1 ++#define ENABLE_CINEPAK_DECODER 1 ++#define CONFIG_FLASHSV_DECODER 1 ++#define ENABLE_FLASHSV_DECODER 1 ++#define CONFIG_H261_DECODER 1 ++#define ENABLE_H261_DECODER 1 ++#define CONFIG_H263_DECODER 1 ++#define ENABLE_H263_DECODER 1 ++#define CONFIG_H263I_DECODER 1 ++#define ENABLE_H263I_DECODER 1 ++#define CONFIG_H264_DECODER 1 ++#define ENABLE_H264_DECODER 1 ++#define CONFIG_INDEO2_DECODER 1 ++#define ENABLE_INDEO2_DECODER 1 ++#define CONFIG_INDEO3_DECODER 1 ++#define ENABLE_INDEO3_DECODER 1 ++#define CONFIG_MJPEG_DECODER 1 ++#define ENABLE_MJPEG_DECODER 1 ++#define CONFIG_MJPEGB_DECODER 1 ++#define ENABLE_MJPEGB_DECODER 1 ++#define CONFIG_MPEG1VIDEO_DECODER 1 ++#define ENABLE_MPEG1VIDEO_DECODER 1 ++#define CONFIG_MPEG2VIDEO_DECODER 1 ++#define ENABLE_MPEG2VIDEO_DECODER 1 ++#define CONFIG_MPEG4_DECODER 1 ++#define ENABLE_MPEG4_DECODER 1 ++#define CONFIG_MPEGVIDEO_DECODER 1 ++#define ENABLE_MPEGVIDEO_DECODER 1 ++#define CONFIG_MSMPEG4V1_DECODER 1 ++#define ENABLE_MSMPEG4V1_DECODER 1 ++#define CONFIG_MSMPEG4V2_DECODER 1 ++#define ENABLE_MSMPEG4V2_DECODER 1 ++#define CONFIG_MSMPEG4V3_DECODER 1 ++#define ENABLE_MSMPEG4V3_DECODER 1 ++#define CONFIG_MSRLE_DECODER 1 ++#define ENABLE_MSRLE_DECODER 1 ++#define CONFIG_MSVIDEO1_DECODER 1 ++#define ENABLE_MSVIDEO1_DECODER 1 ++#define CONFIG_QTRLE_DECODER 1 ++#define ENABLE_QTRLE_DECODER 1 ++#define CONFIG_RV10_DECODER 1 ++#define ENABLE_RV10_DECODER 1 ++#define CONFIG_RV20_DECODER 1 ++#define ENABLE_RV20_DECODER 1 ++#define CONFIG_RV30_DECODER 1 ++#define ENABLE_RV30_DECODER 1 ++#define CONFIG_RV40_DECODER 1 ++#define ENABLE_RV40_DECODER 1 ++#define CONFIG_SVQ1_DECODER 1 ++#define ENABLE_SVQ1_DECODER 1 ++#define CONFIG_SVQ3_DECODER 1 ++#define ENABLE_SVQ3_DECODER 1 ++#define CONFIG_VC1_DECODER 1 ++#define ENABLE_VC1_DECODER 1 ++#define CONFIG_VP3_DECODER 1 ++#define ENABLE_VP3_DECODER 1 ++#define CONFIG_VP5_DECODER 1 ++#define ENABLE_VP5_DECODER 1 ++#define CONFIG_VP6_DECODER 1 ++#define ENABLE_VP6_DECODER 1 ++#define CONFIG_VP6F_DECODER 1 ++#define ENABLE_VP6F_DECODER 1 ++#define CONFIG_VP8_DECODER 1 ++#define ENABLE_VP8_DECODER 1 ++#define CONFIG_WMV1_DECODER 1 ++#define ENABLE_WMV1_DECODER 1 ++#define CONFIG_WMV2_DECODER 1 ++#define ENABLE_WMV2_DECODER 1 ++#define CONFIG_WMV3_DECODER 1 ++#define ENABLE_WMV3_DECODER 1 ++#define CONFIG_COOK_DECODER 1 ++#define ENABLE_COOK_DECODER 1 ++#define CONFIG_DTS_DECODER 1 ++#define ENABLE_DTS_DECODER 1 ++#define CONFIG_EAC3_DECODER 1 ++#define ENABLE_EAC3_DECODER 1 ++#define CONFIG_AAC_LATM_DECODER 1 ++#define ENABLE_AAC_LATM_DECODER 1 ++#define CONFIG_FLAC_DECODER 1 ++#define ENABLE_FLAC_DECODER 1 ++#define CONFIG_MP2_DECODER 1 ++#define ENABLE_MP2_DECODER 1 ++#define CONFIG_MP3_DECODER 1 ++#define ENABLE_MP3_DECODER 1 ++#define CONFIG_QDM2_DECODER 1 ++#define ENABLE_QDM2_DECODER 1 ++#define CONFIG_RA_144_DECODER 1 ++#define ENABLE_RA_144_DECODER 1 ++#define CONFIG_RA_288_DECODER 1 ++#define ENABLE_RA_288_DECODER 1 ++#define CONFIG_WAVPACK_DECODER 1 ++#define ENABLE_WAVPACK_DECODER 1 ++#define CONFIG_WMAV1_DECODER 1 ++#define ENABLE_WMAV1_DECODER 1 ++#define CONFIG_WMAV2_DECODER 1 ++#define ENABLE_WMAV2_DECODER 1 ++#define CONFIG_WMAPRO_DECODER 1 ++#define ENABLE_WMAPRO_DECODER 1 ++#define CONFIG_ADPCM_SWF_DECODER 1 ++#define ENABLE_ADPCM_SWF_DECODER 1 ++#define ENABLE_BMP_DECODER 0 ++#define ENABLE_CAVS_DECODER 0 ++#define ENABLE_CLJR_DECODER 0 ++#define ENABLE_DSICINVIDEO_DECODER 0 ++#define ENABLE_FFV1_DECODER 0 ++#define ENABLE_FFVHUFF_DECODER 0 ++#define ENABLE_GIF_DECODER 0 ++#define ENABLE_MDEC_DECODER 0 ++#define ENABLE_MPEG_XVMC_DECODER 0 ++#define ENABLE_MSZH_DECODER 0 ++#define ENABLE_PNG_DECODER 0 ++#define ENABLE_RAWVIDEO_DECODER 0 ++#define ENABLE_SP5X_DECODER 0 ++#define ENABLE_TARGA_DECODER 0 ++#define ENABLE_TIERTEXSEQVIDEO_DECODER 0 ++#define ENABLE_TIFF_DECODER 0 ++#define ENABLE_VMNC_DECODER 0 ++#define ENABLE_ZLIB_DECODER 0 ++#define ENABLE_DSICINAUDIO_DECODER 0 ++#define ENABLE_IMC_DECODER 0 ++#define ENABLE_MP3ADU_DECODER 0 ++#define ENABLE_MP3ON4_DECODER 0 ++#define ENABLE_MPC7_DECODER 0 ++#define ENABLE_SONIC_DECODER 0 ++#define ENABLE_WS_SND1_DECODER 0 ++#define ENABLE_ADPCM_ADX_DECODER 0 ++#define ENABLE_ADPCM_G726_DECODER 0 ++#define ENABLE_DVBSUB_DECODER 0 ++#define ENABLE_DVDSUB_DECODER 0 ++#define ENABLE_THEORA_DECODER 0 ++#define ENABLE_AAC_DECODER 0 ++#define ENABLE_MPEG4AAC_DECODER 0 ++#define ENABLE_AC3_DECODER 0 ++#define ENABLE_VORBIS_DECODER 0 ++#define ENABLE_AASC_ENCODER 0 ++#define ENABLE_ASV1_ENCODER 0 ++#define ENABLE_ASV2_ENCODER 0 ++#define ENABLE_AVS_ENCODER 0 ++#define ENABLE_CSCD_ENCODER 0 ++#define ENABLE_CYUV_ENCODER 0 ++#define ENABLE_DVVIDEO_ENCODER 0 ++#define ENABLE_EIGHTBPS_ENCODER 0 ++#define ENABLE_FLIC_ENCODER 0 ++#define ENABLE_FLV_ENCODER 0 ++#define ENABLE_FOURXM_ENCODER 0 ++#define ENABLE_FRAPS_ENCODER 0 ++#define ENABLE_HUFFYUV_ENCODER 0 ++#define ENABLE_IDCIN_ENCODER 0 ++#define ENABLE_INTERPLAY_VIDEO_ENCODER 0 ++#define ENABLE_KMVC_ENCODER 0 ++#define ENABLE_LOCO_ENCODER 0 ++#define ENABLE_MMVIDEO_ENCODER 0 ++#define ENABLE_NUV_ENCODER 0 ++#define ENABLE_QDRAW_ENCODER 0 ++#define ENABLE_QPEG_ENCODER 0 ++#define ENABLE_ROQ_ENCODER 0 ++#define ENABLE_RPZA_ENCODER 0 ++#define ENABLE_SMACKER_ENCODER 0 ++#define ENABLE_SMC_ENCODER 0 ++#define ENABLE_SNOW_ENCODER 0 ++#define ENABLE_TRUEMOTION1_ENCODER 0 ++#define ENABLE_TRUEMOTION2_ENCODER 0 ++#define ENABLE_TSCC_ENCODER 0 ++#define ENABLE_ULTI_ENCODER 0 ++#define ENABLE_VCR1_ENCODER 0 ++#define ENABLE_VMDVIDEO_ENCODER 0 ++#define ENABLE_WNV1_ENCODER 0 ++#define ENABLE_XAN_WC3_ENCODER 0 ++#define ENABLE_XL_ENCODER 0 ++#define ENABLE_ZMBV_ENCODER 0 ++#define ENABLE_ALAC_ENCODER 0 ++#define ENABLE_AMR_NB_ENCODER 0 ++#define ENABLE_AMR_WB_ENCODER 0 ++#define ENABLE_LIBGSM_ENCODER 0 ++#define ENABLE_MACE3_ENCODER 0 ++#define ENABLE_MACE6_ENCODER 0 ++#define ENABLE_SHORTEN_ENCODER 0 ++#define ENABLE_SMACKAUD_ENCODER 0 ++#define ENABLE_TRUESPEECH_ENCODER 0 ++#define ENABLE_TTA_ENCODER 0 ++#define ENABLE_VMDAUDIO_ENCODER 0 ++#define ENABLE_PCM_ALAW_ENCODER 0 ++#define ENABLE_PCM_MULAW_ENCODER 0 ++#define ENABLE_PCM_S8_ENCODER 0 ++#define ENABLE_PCM_S16BE_ENCODER 0 ++#define ENABLE_PCM_S16LE_ENCODER 0 ++#define ENABLE_PCM_S24BE_ENCODER 0 ++#define ENABLE_PCM_S24DAUD_ENCODER 0 ++#define ENABLE_PCM_S24LE_ENCODER 0 ++#define ENABLE_PCM_S32BE_ENCODER 0 ++#define ENABLE_PCM_S32LE_ENCODER 0 ++#define ENABLE_PCM_U8_ENCODER 0 ++#define ENABLE_PCM_U16BE_ENCODER 0 ++#define ENABLE_PCM_U16LE_ENCODER 0 ++#define ENABLE_PCM_U24BE_ENCODER 0 ++#define ENABLE_PCM_U24LE_ENCODER 0 ++#define ENABLE_PCM_U32BE_ENCODER 0 ++#define ENABLE_PCM_U32LE_ENCODER 0 ++#define ENABLE_INTERPLAY_DPCM_ENCODER 0 ++#define ENABLE_ROQ_DPCM_ENCODER 0 ++#define ENABLE_SOL_DPCM_ENCODER 0 ++#define ENABLE_VQA_ENCODER 0 ++#define ENABLE_XAN_DPCM_ENCODER 0 ++#define ENABLE_ADPCM_4XM_ENCODER 0 ++#define ENABLE_ADPCM_CT_ENCODER 0 ++#define ENABLE_ADPCM_EA_ENCODER 0 ++#define ENABLE_ADPCM_IMA_DK3_ENCODER 0 ++#define ENABLE_ADPCM_IMA_DK4_ENCODER 0 ++#define ENABLE_ADPCM_IMA_QT_ENCODER 0 ++#define ENABLE_ADPCM_IMA_SMJPEG_ENCODER 0 ++#define ENABLE_ADPCM_IMA_WAV_ENCODER 0 ++#define ENABLE_ADPCM_IMA_WS_ENCODER 0 ++#define ENABLE_ADPCM_MS_ENCODER 0 ++#define ENABLE_ADPCM_SBPRO_2_ENCODER 0 ++#define ENABLE_ADPCM_SBPRO_3_ENCODER 0 ++#define ENABLE_ADPCM_SBPRO_4_ENCODER 0 ++#define ENABLE_ADPCM_XA_ENCODER 0 ++#define ENABLE_ADPCM_YAMAHA_ENCODER 0 ++#define ENABLE_CINEPAK_ENCODER 0 ++#define ENABLE_FLASHSV_ENCODER 0 ++#define ENABLE_H261_ENCODER 0 ++#define ENABLE_H263_ENCODER 0 ++#define ENABLE_H263I_ENCODER 0 ++#define ENABLE_H264_ENCODER 0 ++#define ENABLE_INDEO2_ENCODER 0 ++#define ENABLE_INDEO3_ENCODER 0 ++#define ENABLE_MJPEG_ENCODER 0 ++#define ENABLE_MJPEGB_ENCODER 0 ++#define ENABLE_MPEG1VIDEO_ENCODER 0 ++#define ENABLE_MPEG2VIDEO_ENCODER 0 ++#define ENABLE_MPEG4_ENCODER 0 ++#define ENABLE_MPEGVIDEO_ENCODER 0 ++#define ENABLE_MSMPEG4V1_ENCODER 0 ++#define ENABLE_MSMPEG4V2_ENCODER 0 ++#define ENABLE_MSMPEG4V3_ENCODER 0 ++#define ENABLE_MSRLE_ENCODER 0 ++#define ENABLE_MSVIDEO1_ENCODER 0 ++#define ENABLE_QTRLE_ENCODER 0 ++#define ENABLE_RV10_ENCODER 0 ++#define ENABLE_RV20_ENCODER 0 ++#define ENABLE_RV30_ENCODER 0 ++#define ENABLE_RV40_ENCODER 0 ++#define ENABLE_SVQ1_ENCODER 0 ++#define ENABLE_SVQ3_ENCODER 0 ++#define ENABLE_VC1_ENCODER 0 ++#define ENABLE_VP3_ENCODER 0 ++#define ENABLE_VP5_ENCODER 0 ++#define ENABLE_VP6_ENCODER 0 ++#define ENABLE_VP6F_ENCODER 0 ++#define ENABLE_VP8_ENCODER 0 ++#define ENABLE_WMV1_ENCODER 0 ++#define ENABLE_WMV2_ENCODER 0 ++#define ENABLE_WMV3_ENCODER 0 ++#define ENABLE_COOK_ENCODER 0 ++#define ENABLE_DTS_ENCODER 0 ++#define ENABLE_EAC3_ENCODER 0 ++#define ENABLE_AAC_LATM_ENCODER 0 ++#define ENABLE_FLAC_ENCODER 0 ++#define ENABLE_MP2_ENCODER 0 ++#define ENABLE_MP3_ENCODER 0 ++#define ENABLE_QDM2_ENCODER 0 ++#define ENABLE_RA_144_ENCODER 0 ++#define ENABLE_RA_288_ENCODER 0 ++#define ENABLE_WAVPACK_ENCODER 0 ++#define ENABLE_WMAV1_ENCODER 0 ++#define ENABLE_WMAV2_ENCODER 0 ++#define ENABLE_WMAPRO_ENCODER 0 ++#define ENABLE_ADPCM_SWF_ENCODER 0 ++#define ENABLE_BMP_ENCODER 0 ++#define ENABLE_CAVS_ENCODER 0 ++#define ENABLE_CLJR_ENCODER 0 ++#define ENABLE_DSICINVIDEO_ENCODER 0 ++#define ENABLE_FFV1_ENCODER 0 ++#define ENABLE_FFVHUFF_ENCODER 0 ++#define ENABLE_GIF_ENCODER 0 ++#define ENABLE_MDEC_ENCODER 0 ++#define ENABLE_MPEG_XVMC_ENCODER 0 ++#define ENABLE_MSZH_ENCODER 0 ++#define ENABLE_PNG_ENCODER 0 ++#define ENABLE_RAWVIDEO_ENCODER 0 ++#define ENABLE_SP5X_ENCODER 0 ++#define ENABLE_TARGA_ENCODER 0 ++#define ENABLE_TIERTEXSEQVIDEO_ENCODER 0 ++#define ENABLE_TIFF_ENCODER 0 ++#define ENABLE_VMNC_ENCODER 0 ++#define ENABLE_ZLIB_ENCODER 0 ++#define ENABLE_DSICINAUDIO_ENCODER 0 ++#define ENABLE_IMC_ENCODER 0 ++#define ENABLE_MP3ADU_ENCODER 0 ++#define ENABLE_MP3ON4_ENCODER 0 ++#define ENABLE_MPC7_ENCODER 0 ++#define ENABLE_SONIC_ENCODER 0 ++#define ENABLE_WS_SND1_ENCODER 0 ++#define ENABLE_ADPCM_ADX_ENCODER 0 ++#define ENABLE_ADPCM_G726_ENCODER 0 ++#define ENABLE_DVBSUB_ENCODER 0 ++#define ENABLE_DVDSUB_ENCODER 0 ++#define ENABLE_THEORA_ENCODER 0 ++#define ENABLE_AAC_ENCODER 0 ++#define ENABLE_MPEG4AAC_ENCODER 0 ++#define ENABLE_AC3_ENCODER 0 ++#define ENABLE_VORBIS_ENCODER 0 ++#define ENABLE_H263P_ENCODER 0 ++#define ENABLE_JPEGLS_ENCODER 0 ++#define ENABLE_LJPEG_ENCODER 0 ++#define ENABLE_PAM_ENCODER 0 ++#define ENABLE_PBM_ENCODER 0 ++#define ENABLE_PGM_ENCODER 0 ++#define ENABLE_PGMYUV_ENCODER 0 ++#define ENABLE_PPM_ENCODER 0 ++#define ENABLE_SONIC_LS_ENCODER 0 ++#define ENABLE_AAC_PARSER 0 ++#define ENABLE_AC3_PARSER 0 ++#define ENABLE_CAVSVIDEO_PARSER 0 ++#define ENABLE_DVBSUB_PARSER 0 ++#define ENABLE_DVDSUB_PARSER 0 ++#define ENABLE_H261_PARSER 0 ++#define ENABLE_H263_PARSER 0 ++#define ENABLE_H264_PARSER 0 ++#define ENABLE_MJPEG_PARSER 0 ++#define ENABLE_MPEG4VIDEO_PARSER 0 ++#define ENABLE_MPEGAUDIO_PARSER 0 ++#define ENABLE_MPEGVIDEO_PARSER 0 ++#define ENABLE_PNM_PARSER 0 diff -Nru xine-lib-1.1.21/debian/patches/fix-libav9-ftbfs xine-lib-1.1.21/debian/patches/fix-libav9-ftbfs --- xine-lib-1.1.21/debian/patches/fix-libav9-ftbfs 1970-01-01 01:00:00.000000000 +0100 +++ xine-lib-1.1.21/debian/patches/fix-libav9-ftbfs 2013-09-09 08:42:35.000000000 +0200 @@ -0,0 +1,38 @@ +Description: Fix FTBFS with libav 0.9 because of missing headers and dropped + attribute. This patch is also compatible with libav 0.8. +Author: Fabrice Coutadeur <fabric...@ubuntu.com> + +--- a/src/combined/ffmpeg/ff_audio_decoder.c ++++ b/src/combined/ffmpeg/ff_audio_decoder.c +@@ -44,6 +44,7 @@ + #include "bswap.h" + #include "ffmpeg_decoder.h" + #include "ffmpeg_compat.h" ++#include <libavutil/mem.h> + + #define AUDIOBUFSIZE (64 * 1024) + +--- a/src/combined/ffmpeg/ff_video_decoder.c ++++ b/src/combined/ffmpeg/ff_video_decoder.c +@@ -44,6 +44,7 @@ + #include "xineutils.h" + #include "ffmpeg_decoder.h" + #include "ff_mpeg_parser.h" ++#include <libavutil/mem.h> + + #ifdef HAVE_FFMPEG_AVUTIL_H + # include <postprocess.h> +@@ -258,13 +259,6 @@ + av_frame->linesize[1] = img->pitches[1]; + av_frame->linesize[2] = img->pitches[2]; + +- /* We should really keep track of the ages of xine frames (see +- * avcodec_default_get_buffer in libavcodec/utils.c) +- * For the moment tell ffmpeg that every frame is new (age = bignumber) */ +-#ifdef AVFRAMEAGE +- av_frame->age = 256*256*256*64; +-#endif +- + av_frame->type= FF_BUFFER_TYPE_USER; + + #ifdef AVCODEC_HAS_REORDERED_OPAQUE diff -Nru xine-lib-1.1.21/debian/patches/series xine-lib-1.1.21/debian/patches/series --- xine-lib-1.1.21/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ xine-lib-1.1.21/debian/patches/series 2013-09-14 17:24:55.000000000 +0200 @@ -0,0 +1,2 @@ +fix-libav9-ftbfs +debian-changes
