[med-svn] [Git][med-team/amide][master] 5 commits: d/docs: adjust document location to new source code layout.

Étienne Mollier (@emollier) gitlab at salsa.debian.org
Sat Jul 9 11:01:42 BST 2022 


Étienne Mollier pushed to branch master at Debian Med / amide


Commits:
122a8cca by Étienne Mollier at 2022-07-09T11:24:18+02:00
d/docs: adjust document location to new source code layout.

- - - - -
67c2586a by Étienne Mollier at 2022-07-09T11:49:49+02:00
Add ffmpeg-5.patch: fix ftbfs with ffmpeg 5.0.

Closes: #1004597
Thanks: Fernando Hueso González

- - - - -
9dffcdb5 by Étienne Mollier at 2022-07-09T11:54:01+02:00
d/control: add myself to uploaders.

- - - - -
5d017c24 by Étienne Mollier at 2022-07-09T11:57:58+02:00
d/copyright: adjust to the new source code layout.

- - - - -
1c0bdf2b by Étienne Mollier at 2022-07-09T12:00:53+02:00
ready changelog for upload to unstable.

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/docs
- + debian/patches/ffmpeg-5.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-amide (1.0.6-1) UNRELEASED; urgency=medium
+amide (1.0.6-1) unstable; urgency=medium
 
   * New upstream, and new upstream version.
   * d/{control,copyright,watch}: point to the new Github project.
@@ -8,7 +8,7 @@ amide (1.0.6-1) UNRELEASED; urgency=medium
     [1]: https://sourceforge.net/p/amide/mailman/message/36974307/
     [2]: https://sourceforge.net/p/amide/mailman/message/37637694/
   * Standards-Version: 4.6.1 (routine-update)
-  * Refresh all patches following change of upstream.
+  * Refresh all patches following change of upstream and upstream version.
     Adjusted patches mostly due to change of layout are:
       - 10_Makefile.am.patch
       - 10_configure.ac.patch
@@ -22,10 +22,13 @@ amide (1.0.6-1) UNRELEASED; urgency=medium
       - fix-gcc10.patch
       - gsl_2x.patch
       - libc_2.23.patch
-  * d/rules: adjust to new upstream directory layout.
+  * d/{copyright,docs,rules}: adjust to the new source code layout.
   * Add debian-djdecode.patch: use Debian's djdecode.h.
+  * Add ffmpeg-5.patch: fix ftbfs with ffmpeg 5.0.
+    Thanks to Fernando Hueso González (Closes: #1004597)
+  * d/control: add myself to uploaders.
 
- -- Étienne Mollier <emollier at debian.org>  Fri, 08 Jul 2022 23:18:09 +0200
+ -- Étienne Mollier <emollier at debian.org>  Sat, 09 Jul 2022 11:59:00 +0200
 
 amide (1.0.5-16) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -1,7 +1,8 @@
 Source: amide
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>,
-           Gert Wollny <gewo at debian.org>
+           Gert Wollny <gewo at debian.org>,
+           Étienne Mollier <emollier at debian.org>
 Section: graphics
 Priority: optional
 Build-Depends: libtool,


=====================================
debian/copyright
=====================================
@@ -22,10 +22,10 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General Public
  License, version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-Files: src/amitk_xif_sel.h
-       src/amitk_xif_sel.c
-       src/amitk_dial.h
-       src/amitk_dial.c
+Files: amide-current/src/amitk_xif_sel.h
+       amide-current/src/amitk_xif_sel.c
+       amide-current/src/amitk_dial.h
+       amide-current/src/amitk_dial.c
 Copyright: Copyright (©) 2007 by Andy Loening <loening at alum.mit.edu>
 License: LGPL-2+
  This library is free software; you can redistribute it and/or
@@ -46,7 +46,7 @@ License: LGPL-2+
  On Debian systems, the complete text of the GNU Lesser General Public
  License, version 2.0 can be found in `/usr/share/common-licenses/LGPL-2'.
 
-Files: doc/reference/amitk-docs.sgml
+Files: amide-current/doc/reference/amitk-docs.sgml
 Copyright: Copyright (©) 2007 by Andy Loening <loening at alum.mit.edu>
 License: GFDL-1.1
  Permission is granted to copy, distribute and/or modify


=====================================
debian/docs
=====================================
@@ -1,2 +1,2 @@
-todo
+amide-current/todo
 


=====================================
debian/patches/ffmpeg-5.patch
=====================================
@@ -0,0 +1,75 @@
+Description: fix ftbfs with ffmpeg 5.0.
+Author: Fernando Hueso González <Fernando.Hueso at uv.es>
+Bug: https://github.com/ferdymercury/amide/issues/22
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004597
+Forwarded: https://github.com/ferdymercury/amide/pull/23
+Reviewed-by: Étienne Mollier <emollier at debian.org>
+Last-Update: 2022-07-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- amide.orig/amide-current/src/mpeg_encode.c
++++ amide/amide-current/src/mpeg_encode.c
+@@ -216,11 +216,13 @@
+ 
+ static void mpeg_encoding_init(void) {
+   if (!avcodec_initialized) {
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 137, 100)
+     /* must be called before using avcodec lib */
+     avcodec_register_all();
+     
+     /* register all the codecs */
+     avcodec_register_all();
++#endif
+ 
+     avcodec_initialized=TRUE;
+   }
+@@ -376,8 +378,6 @@
+ gboolean mpeg_encode_frame(gpointer data, GdkPixbuf * pixbuf) {
+   encode_t * encode = data;
+   //  gint out_size;
+-  AVPacket pkt = {0};
+-  int ret, got_packet = 0;
+ 
+   convert_rgb_pixbuf_to_yuv(encode->yuv, pixbuf);
+ 
+@@ -386,13 +386,37 @@
+   //  fwrite(encode->output_buffer, 1, out_size, encode->output_file);
+   //  return TRUE;
+ 
++  #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 37, 100)
++  AVPacket pkt = {0};
++  int ret, got_packet = 0;
+   ret = avcodec_encode_video2(encode->context, &pkt, encode->picture, &got_packet);
+ 
+   if (ret >= 0 && got_packet) {
+-  fwrite(pkt.data, 1, pkt.size, encode->output_file);
+-  av_packet_unref(&pkt);
+-}
++    fwrite(pkt.data, 1, pkt.size, encode->output_file);
++    av_packet_unref(&pkt);
++  }
+   return (ret >= 0) ? TRUE : FALSE;
++  #else
++  int result = avcodec_send_frame(encode->context, encode->picture);
++  if (result == AVERROR_EOF)
++    return TRUE;
++  else if (result < 0)
++    return FALSE;
++  else {
++    AVPacket* pkt = av_packet_alloc();
++    if (pkt != NULL) {
++      while (avcodec_receive_packet(encode->context, pkt) == 0) {
++        fwrite(pkt->data, 1, pkt->size, encode->output_file);
++        av_packet_unref(pkt);
++      }
++      av_packet_free(&pkt);
++      return TRUE;
++    }
++    else {
++      return FALSE;
++    }
++  }
++  #endif
+ };
+ 
+ /* close everything up */


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@
 libav10.patch
 remove-autdated-gnome-macros.patch
 debian-djdecode.patch
+ffmpeg-5.patch



View it on GitLab: https://salsa.debian.org/med-team/amide/-/compare/ccc9c787be97781dc7895ec7aa95cf5010bf8f2d...1c0bdf2b2621416c5490f431827390379c3dcabc

-- 
View it on GitLab: https://salsa.debian.org/med-team/amide/-/compare/ccc9c787be97781dc7895ec7aa95cf5010bf8f2d...1c0bdf2b2621416c5490f431827390379c3dcabc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220709/cf21c946/attachment-0001.htm>

More information about the debian-med-commit mailing list