commit b0fcc3526809d9b7282a4d6afe865fbd3cb293ef · pyrox.dev/nixpkgs

+91

pkgs/by-name/re/renpy/5687.patch

···

       1
       1
       +
       From b120f82f9809b98231188daacb94f22a9e69187a Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Gregor Riepl <onitake@gmail.com>

     

       3
       3
       +
       Date: Thu, 8 Aug 2024 23:56:16 +0200

     

       4
       4
       +
       Subject: [PATCH] Replace deprecated APIs when compiling against newer FFmpeg

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        module/ffmedia.c | 37 +++++++++++++++++++++++++++++++++++++

     

       8
       8
       +
        1 file changed, 37 insertions(+)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/module/ffmedia.c b/module/ffmedia.c

     

       11
       11
       +
       index d4bb346ac35740711b8393e66d0bfc28c849ff0e..0f57e311f277359fad731e348531becbadbb06d4 100644

     

       12
       12
       +
       --- a/module/ffmedia.c

     

       13
       13
       +
       +++ b/module/ffmedia.c

     

       14
       14
       +
       @@ -71,7 +71,11 @@ static int rwops_read(void *opaque, uint8_t *buf, int buf_size) {

     

       15
       15
       +
        

     

       16
       16
       +
        }

     

       17
       17
       +
        

     

       18
       18
       +
       +#if (LIBAVFORMAT_VERSION_MAJOR < 61)

     

       19
       19
       +
        static int rwops_write(void *opaque, uint8_t *buf, int buf_size) {

     

       20
       20
       +
       +#else

     

       21
       21
       +
       +static int rwops_write(void *opaque, const uint8_t *buf, int buf_size) {

     

       22
       22
       +
       +#endif

     

       23
       23
       +
            printf("Writing to an SDL_rwops is a really bad idea.\n");

     

       24
       24
       +
            return -1;

     

       25
       25
       +
        }

     

       26
       26
       +
       @@ -690,9 +694,14 @@ static void decode_audio(MediaState *ms) {

     

       27
       27
       +
        			}

     

       28
       28
       +
        

     

       29
       29
       +
                    converted_frame->sample_rate = audio_sample_rate;

     

       30
       30
       +
       +#if (LIBAVUTIL_VERSION_MAJOR < 59)

     

       31
       31
       +
                    converted_frame->channel_layout = AV_CH_LAYOUT_STEREO;

     

       32
       32
       +
       +#else

     

       33
       33
       +
       +            converted_frame->ch_layout = (AVChannelLayout) AV_CHANNEL_LAYOUT_STEREO;

     

       34
       34
       +
       +#endif

     

       35
       35
       +
                    converted_frame->format = AV_SAMPLE_FMT_S16;

     

       36
       36
       +
        

     

       37
       37
       +
       +#if (LIBAVUTIL_VERSION_MAJOR < 59)

     

       38
       38
       +
        			if (!ms->audio_decode_frame->channel_layout) {

     

       39
       39
       +
        				ms->audio_decode_frame->channel_layout = av_get_default_channel_layout(ms->audio_decode_frame->channels);

     

       40
       40
       +
        

     

       41
       41
       +
       @@ -711,6 +720,26 @@ static void decode_audio(MediaState *ms) {

     

       42
       42
       +
        				    swr_set_matrix(ms->swr, stereo_matrix, 1);

     

       43
       43
       +
        				}

     

       44
       44
       +
        			}

     

       45
       45
       +
       +#else

     

       46
       46
       +
       +			if (ms->audio_decode_frame->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) {

     

       47
       47
       +
       +				av_channel_layout_default(&ms->audio_decode_frame->ch_layout, ms->audio_decode_frame->ch_layout.nb_channels);

     

       48
       48
       +
       +

     

       49
       49
       +
       +				if (audio_equal_mono && (ms->audio_decode_frame->ch_layout.nb_channels == 1)) {

     

       50
       50
       +
       +				    swr_alloc_set_opts2(

     

       51
       51
       +
       +                        &ms->swr,

     

       52
       52
       +
       +                        &converted_frame->ch_layout,

     

       53
       53
       +
       +                        converted_frame->format,

     

       54
       54
       +
       +                        converted_frame->sample_rate,

     

       55
       55
       +
       +                        &ms->audio_decode_frame->ch_layout,

     

       56
       56
       +
       +                        ms->audio_decode_frame->format,

     

       57
       57
       +
       +                        ms->audio_decode_frame->sample_rate,

     

       58
       58
       +
       +                        0,

     

       59
       59
       +
       +                        NULL);

     

       60
       60
       +
       +

     

       61
       61
       +
       +				    swr_set_matrix(ms->swr, stereo_matrix, 1);

     

       62
       62
       +
       +				}

     

       63
       63
       +
       +			}

     

       64
       64
       +
       +#endif

     

       65
       65
       +
        

     

       66
       66
       +
        			if(swr_convert_frame(ms->swr, converted_frame, ms->audio_decode_frame)) {

     

       67
       67
       +
        				av_frame_free(&converted_frame);

     

       68
       68
       +
       @@ -1159,7 +1188,11 @@ static int decode_thread(void *arg) {

     

       69
       69
       +
        

     

       70
       70
       +
        	// Compute the number of samples we need to play back.

     

       71
       71
       +
        	if (ms->audio_duration < 0) {

     

       72
       72
       +
       +#if (LIBAVFORMAT_VERSION_MAJOR < 62)

     

       73
       73
       +
        		if (av_fmt_ctx_get_duration_estimation_method(ctx) != AVFMT_DURATION_FROM_BITRATE) {

     

       74
       74
       +
       +#else

     

       75
       75
       +
       +		if (ctx->duration_estimation_method != AVFMT_DURATION_FROM_BITRATE) {

     

       76
       76
       +
       +#endif

     

       77
       77
       +
        

     

       78
       78
       +
        			long long duration = ((long long) ctx->duration) * audio_sample_rate;

     

       79
       79
       +
        			ms->audio_duration = (unsigned int) (duration /  AV_TIME_BASE);

     

       80
       80
       +
       @@ -1319,7 +1352,11 @@ static int decode_sync_start(void *arg) {

     

       81
       81
       +
        

     

       82
       82
       +
        	// Compute the number of samples we need to play back.

     

       83
       83
       +
        	if (ms->audio_duration < 0) {

     

       84
       84
       +
       +#if (LIBAVFORMAT_VERSION_MAJOR < 62)

     

       85
       85
       +
        		if (av_fmt_ctx_get_duration_estimation_method(ctx) != AVFMT_DURATION_FROM_BITRATE) {

     

       86
       86
       +
       +#else

     

       87
       87
       +
       +		if (ctx->duration_estimation_method != AVFMT_DURATION_FROM_BITRATE) {

     

       88
       88
       +
       +#endif

     

       89
       89
       +
        

     

       90
       90
       +
        			long long duration = ((long long) ctx->duration) * audio_sample_rate;

     

       91
       91
       +
        			ms->audio_duration = (unsigned int) (duration /  AV_TIME_BASE);

+5 -1

pkgs/by-name/re/renpy/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         python311,

     

       6
       7
        
         pkg-config,

     

       7
       8
        
         SDL2,

     
···

       86
       87
        
       

     

       87
       88
        
         enableParallelBuilding = true;

     

       88
       89
        
       

     

       89
       89
       -
         patches = [ ./shutup-erofs-errors.patch ];

     

       90
       90
       +
         patches = [

     

       91
       91
       +
           ./shutup-erofs-errors.patch

     

       92
       92
       +
           ./5687.patch

     

       93
       93
       +
         ];

     

       90
       94
        
       

     

       91
       95
        
         postPatch = ''

     

       92
       96
        
           cp tutorial/game/tutorial_director.rpy{m,}