[renpy] 04/11: Drop 04_typo.patch, IMG_savepng.c.patch, ffmpeg-2.9.patch
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Mar 13 20:14:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository renpy.
commit b4115186f4c49050c8e389e9378de8274c8a5e9d
Author: Markus Koschany <apo at debian.org>
Date: Sun Mar 13 18:40:05 2016 +0100
Drop 04_typo.patch, IMG_savepng.c.patch, ffmpeg-2.9.patch
---
debian/patches/04_typo.patch | 36 --------------
debian/patches/IMG_savepng.c.patch | 21 --------
debian/patches/ffmpeg-2.9.patch | 98 --------------------------------------
debian/patches/series | 3 --
4 files changed, 158 deletions(-)
diff --git a/debian/patches/04_typo.patch b/debian/patches/04_typo.patch
deleted file mode 100644
index a18df92..0000000
--- a/debian/patches/04_typo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Date: Tue, 12 Jan 2016 18:15:44 +0100
-Subject: _typo
-
-===================================================================
----
- module/gen/renpy.angle.gldraw.c | 2 +-
- module/gen/renpy.gl.gldraw.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/module/gen/renpy.angle.gldraw.c b/module/gen/renpy.angle.gldraw.c
-index 0740efe..364ebd1 100644
---- a/module/gen/renpy.angle.gldraw.c
-+++ b/module/gen/renpy.angle.gldraw.c
-@@ -2258,7 +2258,7 @@ static int __pyx_pf_5renpy_5angle_6gldraw_6GLDraw___init__(struct __pyx_obj_5ren
-
- /* Python wrapper */
- static PyObject *__pyx_pw_5renpy_5angle_6gldraw_6GLDraw_3set_mode(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
--static char __pyx_doc_5renpy_5angle_6gldraw_6GLDraw_2set_mode[] = "\n This changes the video mode. It also initializes OpenGL, if it\n can. It returns True if it was succesful, or False if OpenGL isn't\n working for some reason.\n ";
-+static char __pyx_doc_5renpy_5angle_6gldraw_6GLDraw_2set_mode[] = "\n This changes the video mode. It also initializes OpenGL, if it\n can. It returns True if it was successful, or False if OpenGL isn't\n working for some reason.\n ";
- static PyObject *__pyx_pw_5renpy_5angle_6gldraw_6GLDraw_3set_mode(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
- PyObject *__pyx_v_virtual_size = 0;
- PyObject *__pyx_v_physical_size = 0;
-diff --git a/module/gen/renpy.gl.gldraw.c b/module/gen/renpy.gl.gldraw.c
-index 222640f..a2358ad 100644
---- a/module/gen/renpy.gl.gldraw.c
-+++ b/module/gen/renpy.gl.gldraw.c
-@@ -2268,7 +2268,7 @@ static int __pyx_pf_5renpy_2gl_6gldraw_6GLDraw___init__(struct __pyx_obj_5renpy_
-
- /* Python wrapper */
- static PyObject *__pyx_pw_5renpy_2gl_6gldraw_6GLDraw_3set_mode(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
--static char __pyx_doc_5renpy_2gl_6gldraw_6GLDraw_2set_mode[] = "\n This changes the video mode. It also initializes OpenGL, if it\n can. It returns True if it was succesful, or False if OpenGL isn't\n working for some reason.\n ";
-+static char __pyx_doc_5renpy_2gl_6gldraw_6GLDraw_2set_mode[] = "\n This changes the video mode. It also initializes OpenGL, if it\n can. It returns True if it was successful, or False if OpenGL isn't\n working for some reason.\n ";
- static PyObject *__pyx_pw_5renpy_2gl_6gldraw_6GLDraw_3set_mode(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
- PyObject *__pyx_v_virtual_size = 0;
- PyObject *__pyx_v_physical_size = 0;
diff --git a/debian/patches/IMG_savepng.c.patch b/debian/patches/IMG_savepng.c.patch
deleted file mode 100644
index 09d8b90..0000000
--- a/debian/patches/IMG_savepng.c.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 26 Jan 2016 17:50:23 +0100
-Subject: IMG_savepng.c
-
----
- module/IMG_savepng.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/module/IMG_savepng.c b/module/IMG_savepng.c
-index cef5490..0ce6421 100644
---- a/module/IMG_savepng.c
-+++ b/module/IMG_savepng.c
-@@ -133,7 +133,7 @@ int IMG_SavePNG_RW(SDL_RWops *src, SDL_Surface *surf,int compression){
- }
- #else
- if (fmt->Amask) {
-- target_format = SDL_PIXELFORMAT_RGBA8888
-+ target_format = SDL_PIXELFORMAT_RGBA8888;
- } else {
- target_format = SDL_PIXELFORMAT_RGB888;
- }
diff --git a/debian/patches/ffmpeg-2.9.patch b/debian/patches/ffmpeg-2.9.patch
deleted file mode 100644
index 45317c0..0000000
--- a/debian/patches/ffmpeg-2.9.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 25 Jan 2016 19:26:06 +0100
-Subject: ffmpeg 2.9
-
-Remove deprecated macros and ensure that Renpy can be built from source with
-ffmpeg 2.9.
-
-Debian-Bug: https://bugs.debian.org/803858
-Debian-Bug: https://bugs.debian.org/758365
----
- module/ffdecode.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/module/ffdecode.c b/module/ffdecode.c
-index 71704cf..085000d 100644
---- a/module/ffdecode.c
-+++ b/module/ffdecode.c
-@@ -103,8 +103,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
-@@ -583,7 +583,7 @@ static int video_refresh(void *opaque)
-
- is->first_frame = 0;
-
-- av_free(vp->frame);
-+ av_frame_free(&vp->frame);
- vp->frame = NULL;
-
- /* update queue size and signal for next picture */
-@@ -635,13 +635,13 @@ static void alloc_picture(void *opaque, PyObject *pysurf)
-
- pixel = SDL_MapRGBA(surf->format, 1, 2, 3, 4);
- if (bytes[0] == 4 && bytes[1] == 1) {
-- vp->fmt = PIX_FMT_ARGB;
-+ vp->fmt = AV_PIX_FMT_ARGB;
- } else if (bytes[0] == 4 && bytes[1] == 3) {
-- vp->fmt = PIX_FMT_ABGR;
-+ vp->fmt = AV_PIX_FMT_ABGR;
- } else if (bytes[0] == 1) {
-- vp->fmt = PIX_FMT_RGBA;
-+ vp->fmt = AV_PIX_FMT_RGBA;
- } else {
-- vp->fmt = PIX_FMT_BGRA;
-+ vp->fmt = AV_PIX_FMT_BGRA;
- }
-
- pixel = SDL_MapRGBA(surf->format, 0, 0, 0, 255);
-@@ -764,7 +764,7 @@ static int video_thread(void *arg)
- double pts;
-
- for(;;) {
-- frame = avcodec_alloc_frame();
-+ frame = av_frame_alloc();
-
- while (is->paused && !is->videoq.abort_request) {
- SDL_Delay(2);
-@@ -824,10 +824,10 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
- int resample_changed, audio_resample;
-
- if (!is->frame) {
-- if (!(is->frame = avcodec_alloc_frame()))
-+ if (!(is->frame = av_frame_alloc()))
- return AVERROR(ENOMEM);
- } else
-- avcodec_get_frame_defaults(is->frame);
-+ av_frame_unref(is->frame);
-
- if (flush_complete)
- break;
-@@ -1244,9 +1244,9 @@ static int stream_component_open(VideoState *is, int stream_index)
- /* prepare audio output */
- if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
- if (enc->channels > 0) {
-- enc->request_channels = FFMIN(2, enc->channels);
-+ enc->request_channel_layout = av_get_default_channel_layout(FFMIN(2, enc->channels));
- } else {
-- enc->request_channels = 2;
-+ enc->request_channel_layout = av_get_default_channel_layout(2);
- }
- }
-
-@@ -1653,7 +1653,7 @@ void ffpy_stream_close(VideoState *is)
- for(i=0; i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
- vp = &is->pictq[i];
- if (vp->frame) {
-- av_free(vp->frame);
-+ av_frame_free(&vp->frame);
- }
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index c474f88..0a30345 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
01_abspath.patch
02_traceback.patch
03_checkdir.patch
-04_typo.patch
-ffmpeg-2.9.patch
-IMG_savepng.c.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/renpy.git
More information about the Pkg-games-commits
mailing list