Control: tags 1041376 + patch Control: tags 1041376 + pending Dear maintainer,
I've prepared an NMU for comskip (versioned as 0.82.009+git20230112.d0cc422+ds.1-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru comskip-0.82.009+git20230112.d0cc422+ds.1/debian/changelog comskip-0.82.009+git20230112.d0cc422+ds.1/debian/changelog --- comskip-0.82.009+git20230112.d0cc422+ds.1/debian/changelog 2023-01-13 11:35:18.000000000 +0100 +++ comskip-0.82.009+git20230112.d0cc422+ds.1/debian/changelog 2023-11-30 22:56:06.000000000 +0100 @@ -1,3 +1,10 @@ +comskip (0.82.009+git20230112.d0cc422+ds.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: Fix build with ffmpeg 6 (Closes: #1041376) + + -- Sebastian Ramacher <sramac...@debian.org> Thu, 30 Nov 2023 22:56:06 +0100 + comskip (0.82.009+git20230112.d0cc422+ds.1-2) unstable; urgency=medium [ Debian Janitor ] diff -Nru comskip-0.82.009+git20230112.d0cc422+ds.1/debian/patches/ffmpeg-6.patch comskip-0.82.009+git20230112.d0cc422+ds.1/debian/patches/ffmpeg-6.patch --- comskip-0.82.009+git20230112.d0cc422+ds.1/debian/patches/ffmpeg-6.patch 1970-01-01 01:00:00.000000000 +0100 +++ comskip-0.82.009+git20230112.d0cc422+ds.1/debian/patches/ffmpeg-6.patch 2023-11-30 22:54:14.000000000 +0100 @@ -0,0 +1,18 @@ +--- a/comskip.h ++++ b/comskip.h +@@ -8,3 +8,15 @@ + + #define MAXWIDTH 8000 + #define MAXHEIGHT 4800 ++ ++#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C) ++ #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v ++#elif defined(__DJGPP__) ++ #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (FFMIN(n, 16)))) v ++#elif defined(__GNUC__) || defined(__clang__) ++ #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v ++#elif defined(_MSC_VER) ++ #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v ++#else ++ #define DECLARE_ALIGNED(n,t,v) t v ++#endif diff -Nru comskip-0.82.009+git20230112.d0cc422+ds.1/debian/patches/series comskip-0.82.009+git20230112.d0cc422+ds.1/debian/patches/series --- comskip-0.82.009+git20230112.d0cc422+ds.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ comskip-0.82.009+git20230112.d0cc422+ds.1/debian/patches/series 2023-11-30 22:52:13.000000000 +0100 @@ -0,0 +1 @@ +ffmpeg-6.patch
