Your message dated Tue, 12 Jan 2016 21:46:21 +0000
with message-id <[email protected]>
and subject line Bug#758365: fixed in renpy 6.17.6-2
has caused the Debian Bug report #758365,
regarding Replace macros removed from FFmpeg
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
758365: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758365
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: renpy
Version: 6.17.6-1.1
Severity: wishlist
Tags: patch
Usertags: reintroducing-ffmpeg
Dear maintainer,
I am working on reintroducing FFmpeg to Debian [1-2].
In order to make FFmpeg co-installable with Libav, the libraries were
renamed to lib*-ffmpeg. Thus using linker flags like '-lavcodec' doesn't
work with the FFmpeg packages.
To get the correct linking flags for both FFmpeg and Libav, one can
(and should) use pkg-config.
Attached patch achieves that for this package. Please apply it to
facilitate building your package with FFmpeg in Debian.
If you want to facilitate this even further, you can also add
lib*-ffmpeg-dev alternatives to the Libav build-dependencies.
While the FFmpeg package is still waiting in the NEW queue [3], it can
already be built from the git repository [4].
The other patch is necessary to fix building against FFmpeg.
Best regards,
Andreas
1: https://lists.debian.org/debian-devel/2014/07/msg01010.html
2: https://bugs.debian.org/729203
3: https://ftp-master.debian.org/new/ffmpeg_7:2.3.1-1.html
4: https://anonscm.debian.org/cgit/collab-maint/ffmpeg.git
diff --git a/debian/patches/Replace-removed-macros.patch b/debian/patches/Replace-removed-macros.patch
new file mode 100644
index 0000000..433073c
--- /dev/null
+++ b/debian/patches/Replace-removed-macros.patch
@@ -0,0 +1,19 @@
+Description: Replace removed macros
+ Replace AVCODEC_MAX_AUDIO_FRAME_SIZE with its previous value 192000.
+
+Author: Andreas Cadhalpun <[email protected]>
+Last-Update: <2014-04-25>
+
+--- renpy-6.16.5.orig/module/ffdecode.c
++++ renpy-6.16.5/module/ffdecode.c
+@@ -101,8 +101,8 @@ typedef struct VideoState {
+ compensation */
+
+ #ifndef HAS_RESAMPLE
+- uint8_t audio_buf1[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
+- uint8_t audio_buf2[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
++ uint8_t audio_buf1[(192000 * 3) / 2] __attribute__ ((aligned (16))) ;
++ uint8_t audio_buf2[(192000 * 3) / 2] __attribute__ ((aligned (16))) ;
+ #else
+ uint8_t *audio_buf1;
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 5722499..53ef794 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
03_checkdir.patch
04_typo.patch
05_pxi_files.patch
+Replace-removed-macros.patch
diff --git a/debian/patches/pkg-config.patch b/debian/patches/pkg-config.patch
new file mode 100644
index 0000000..0319cde
--- /dev/null
+++ b/debian/patches/pkg-config.patch
@@ -0,0 +1,69 @@
+Description: Use pkg-config to determine FFmpeg linker flags.
+
+Author: Andreas Cadhalpun <[email protected]>
+Last-Update: <2014-05-15>
+
+--- renpy-6.16.5.orig/module/setup.py
++++ renpy-6.16.5/module/setup.py
+@@ -3,6 +3,7 @@
+ import platform
+ import sys
+ import os
++import subprocess
+
+ # Change to the directory containing this file.
+ os.chdir(os.path.abspath(os.path.dirname(sys.argv[0])))
+@@ -34,11 +35,29 @@ include("GL/glew.h")
+
+ library("SDL")
+ library("png")
+-library("avformat")
+-library("avcodec")
+-library("avutil")
+-has_avresample = library("avresample", optional=True)
+-has_swscale = library("swscale", optional=True)
++
++avf_name = subprocess.check_output(["pkg-config", "--libs", "libavformat"]).decode(encoding="utf8").lstrip('-l').rstrip(' \n')
++avc_name = subprocess.check_output(["pkg-config", "--libs", "libavcodec"]).decode(encoding="utf8").lstrip('-l').rstrip(' \n')
++avu_name = subprocess.check_output(["pkg-config", "--libs", "libavutil"]).decode(encoding="utf8").lstrip('-l').rstrip(' \n')
++
++try:
++ avr_name = subprocess.check_output(["pkg-config", "--libs", "libavresample"]).decode(encoding="utf8").lstrip('-l').rstrip(' \n')
++except subprocess.CalledProcessError:
++ # Ignore errors that are caused by the library not being present.
++ avr_name = "avresample"
++
++
++try:
++ sws_name = subprocess.check_output(["pkg-config", "--libs", "libswscale"]).decode(encoding="utf8").lstrip('-l').rstrip(' \n')
++except subprocess.CalledProcessError:
++ # Ignore errors that are caused by the library not being present.
++ sws_name = "swscale"
++
++library(avf_name)
++library(avc_name)
++library(avu_name)
++has_avresample = library(avr_name, optional=True)
++has_swscale = library(sws_name, optional=True)
+ library("freetype")
+ has_fribidi = library("fribidi", optional=True)
+ library("z")
+@@ -69,15 +88,15 @@ pymodule("pysdlsound.__init__")
+
+ if not android:
+
+- sound = [ "avformat", "avcodec", "avutil", "z" ]
++ sound = [ avf_name, avc_name, avu_name, "z" ]
+ macros = [ ]
+
+ if has_avresample:
+- sound.insert(0, "avresample")
++ sound.insert(0, avr_name)
+ macros.append(("HAS_RESAMPLE", 1))
+
+ if has_swscale:
+- sound.insert(0, "swscale")
++ sound.insert(0, sws_name)
+
+ cython(
+ "pysdlsound.sound",
diff --git a/debian/patches/series b/debian/patches/series
index 3da2d94..33b1dd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
04_typo.patch
05_pxi_files.patch
Replace-removed-macros.patch
+pkg-config.patch
--- End Message ---
--- Begin Message ---
Source: renpy
Source-Version: 6.17.6-2
We believe that the bug you reported is fixed in the latest version of
renpy, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Markus Koschany <[email protected]> (supplier of updated renpy package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 12 Jan 2016 20:21:20 +0100
Source: renpy
Binary: renpy python-renpy renpy-doc renpy-demo renpy-thequestion
Architecture: source
Version: 6.17.6-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Games Team <[email protected]>
Changed-By: Markus Koschany <[email protected]>
Description:
python-renpy - framework for developing visual-novel type games - Python module
renpy - framework for developing visual-novel type games
renpy-demo - framework for developing visual-novel type games - demo
renpy-doc - framework for developing visual-novel type games - doc
renpy-thequestion - simple and complete Ren'Py game
Closes: 662492 758365 803858
Changes:
renpy (6.17.6-2) unstable; urgency=medium
.
* Team upload.
* Fix FTBFS with FFmpeg 2.9. Thanks to Andreas Cadhalpun for the report and
patch. (Closes: #803858)
* Replace macros removed from FFmpeg. Thanks to Andreas Cadhalpun for the
report and patch. (Closes: #758365)
* wrap-and-sort -sa.
* Declare compliance with Debian Policy 3.9.6.
* Move the package to Git.
* Remove debian/pycompat because it is obsolete.
* Remove README.source because source format 3.0 uses quilt by default.
* d/control:
- Remove quilt from Build-Depends.
- Remove dpkg-dev from Build-Depends.
- Use unversioned libglew-dev build-dependency.
- Remove versioned dependency on python-pygame.
- Switch to fonts-dejavu-core.
- Replace fonts-roboto with fonts-roboto-hinted and adjust the
paths in links files accordingly.
- Build-depend on libpng-dev instead of libpng12-dev. (Closes: #662492)
* renpy-doc: Depend on libjs-jquery and libjs-underscore and fix Lintian
warning about embedded javascript libraries.
* Simplify debian/rules by using dh sequencer.
Remove dirs and docs file and use install files instead. Replace
dh_install, dh_links and dh_installmanpages commands with install, links
and manpages files.
* Ensure renpy can be built twice in a row.
* source/options: Do not use bzip compression and use xz compression instead.
* Update debian/watch and detect the latest releases. Thanks to Bart Martens.
* desktop files: Add keywords and a comment in German. Change category key to
Game;AdventureGame;
Checksums-Sha1:
9ab1722494f4ae4cabb31e5c4900e1f903d11131 2570 renpy_6.17.6-2.dsc
00273af3d2a20fb1ed2f7ea31d44b53e21c1d2c4 57260 renpy_6.17.6-2.debian.tar.xz
Checksums-Sha256:
a7a089d6b28d463f1a3850b0886334ecf45c55cd249767ba21ba642d47cbb0fa 2570
renpy_6.17.6-2.dsc
a7366587b45427db2a51d28ba047f75283f4cf40608b155c302e6651bd146084 57260
renpy_6.17.6-2.debian.tar.xz
Files:
261d526e565bd4b6fb2da5e9ddfdaf5e 2570 games optional renpy_6.17.6-2.dsc
211e46a5867b7f3f1200459beebe3684 57260 games optional
renpy_6.17.6-2.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQJ8BAEBCgBmBQJWlVrYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQ0YzRDA4OEVGMzJFREVGNkExQTgzNUZE
OUFEMTRCOTUxM0I1MUU0AAoJENmtFLlRO1HkKaAQALoIbSpZYcT8VavHxxOSQaVY
sPT847SQAeGF51Np/N9yd5cqjq/EjWw/Zglj6wvxUMmKFXPMRLt/gW6cG2fw8sIg
TwXVTTi5JqJOjck2MQ3tunoX/rspT3gdR3VQG5homVD3oLaWSZaisF26jtxxx0ql
nRcoUo7F6W2eGAzFDsZhAB4FQjzP8HcKxvXscYvGIzyEQVBsARKO63k7Nu95qp5k
eSaIR8QKIcqas4BP98Mbhp/IiFNel9xFi3QaQJtWjipdeJX0VuO7DJJvFWSG5gsK
zLYGOkZeusmOfGwRAp4oG50H1ekZf37mz+AfuTtqL7gJYsW+pvELiVo43QMgt6Sy
E0bhnHMTvqDnf3tXOWjNnphYOkLK+qbAGbjsqDLIf3lK6z4EtZ5OXj8twElq25u3
rSyeaiGWs3NQ64ZEFYFPofCQ8deUmxHRWkiz+rUA3UAzJNu7r5DhMuZ4g4eq4TxJ
JNa8lDOVwCINngzSDs0j2VcZqjRQCKaQLoQ7pjeS4mQfeGnygPP02/4gGaFkBLVb
JBKV0KdnjXUQSzKG6UGRIJ/2UfKms2hD1hCxGf+KeJ0/DErTtOJrjQOrVcP8FvGD
maVa9W4lpZ96tyjlvtohXaV8c0N40i3hpN03blGDnLT+lE7IABSLNgpVVtXqoF1V
+SmoYX8nw20puxZodSrc
=0Xz2
-----END PGP SIGNATURE-----
--- End Message ---
