wok-next diff gst0-plugins-bad/stuff/patches/opus-jpegformat-unbreak-non-debug-build.patch @ rev 19865

slitaz-base-files: typo
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Sep 12 03:41:56 2017 +0300 (2017-09-12)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gst0-plugins-bad/stuff/patches/opus-jpegformat-unbreak-non-debug-build.patch	Tue Sep 12 03:41:56 2017 +0300
     1.3 @@ -0,0 +1,78 @@
     1.4 +From 1725e702a3622cb45c8142622dd419fa0c410ac9 Mon Sep 17 00:00:00 2001
     1.5 +From: Peter Korsgaard <jacmet@sunsite.dk>
     1.6 +Date: Wed, 12 Sep 2012 09:10:35 +0200
     1.7 +Subject: [PATCH] gst-plugins-bad: opus + jpegformat: unbreak non-debug build
     1.8 +
     1.9 +opus + jpegformat plugin builds fail when gstreamer is configured with
    1.10 +--disable-gst-debug as they are checking the GST_DISABLE_DEBUG symbol
    1.11 +instead of GST_DISABLE_GST_DEBUG.
    1.12 +
    1.13 +Submitted upstream as https://bugzilla.gnome.org/show_bug.cgi?id=683850
    1.14 +
    1.15 +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
    1.16 +---
    1.17 + ext/opus/gstopusdec.c         |    2 +-
    1.18 + ext/opus/gstopusenc.c         |    4 ++--
    1.19 + gst/jpegformat/gstjpegparse.c |    4 ++--
    1.20 + 3 files changed, 5 insertions(+), 5 deletions(-)
    1.21 +
    1.22 +diff --git a/ext/opus/gstopusdec.c b/ext/opus/gstopusdec.c
    1.23 +index 0e2805c..ab7221d 100644
    1.24 +--- a/ext/opus/gstopusdec.c
    1.25 ++++ b/ext/opus/gstopusdec.c
    1.26 +@@ -357,7 +357,7 @@ opus_dec_chain_parse_data (GstOpusDec * dec, GstBuffer * buffer)
    1.27 + 
    1.28 +     GST_DEBUG_OBJECT (dec, "Creating decoder with %d channels, %d Hz",
    1.29 +         dec->n_channels, dec->sample_rate);
    1.30 +-#ifndef GST_DISABLE_DEBUG
    1.31 ++#ifndef GST_DISABLE_GST_DEBUG
    1.32 +     gst_opus_common_log_channel_mapping_table (GST_ELEMENT (dec), opusdec_debug,
    1.33 +         "Mapping table", dec->n_channels, dec->channel_mapping);
    1.34 + #endif
    1.35 +diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c
    1.36 +index 240a2cb..d991795 100644
    1.37 +--- a/ext/opus/gstopusenc.c
    1.38 ++++ b/ext/opus/gstopusenc.c
    1.39 +@@ -589,7 +589,7 @@ gst_opus_enc_setup_channel_mappings (GstOpusEnc * enc,
    1.40 +       }
    1.41 +     }
    1.42 + 
    1.43 +-#ifndef GST_DISABLE_DEBUG
    1.44 ++#ifndef GST_DISABLE_GST_DEBUG
    1.45 +     GST_INFO_OBJECT (enc,
    1.46 +         "Mapping tables built: %d channels, %d stereo streams", enc->n_channels,
    1.47 +         enc->n_stereo_streams);
    1.48 +@@ -654,7 +654,7 @@ gst_opus_enc_setup (GstOpusEnc * enc)
    1.49 + {
    1.50 +   int error = OPUS_OK;
    1.51 + 
    1.52 +-#ifndef GST_DISABLE_DEBUG
    1.53 ++#ifndef GST_DISABLE_GST_DEBUG
    1.54 +   GST_DEBUG_OBJECT (enc,
    1.55 +       "setup: %d Hz, %d channels, %d stereo streams, family %d",
    1.56 +       enc->sample_rate, enc->n_channels, enc->n_stereo_streams,
    1.57 +diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c
    1.58 +index f984a52..b4af9ed 100644
    1.59 +--- a/gst/jpegformat/gstjpegparse.c
    1.60 ++++ b/gst/jpegformat/gstjpegparse.c
    1.61 +@@ -545,7 +545,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse,
    1.62 +   if (!gst_byte_reader_get_uint16_be (reader, &size))
    1.63 +     return FALSE;
    1.64 + 
    1.65 +-#ifndef GST_DISABLE_DEBUG
    1.66 ++#ifndef GST_DISABLE_GST_DEBUG
    1.67 +   /* We'd pry the id of the skipped application segment */
    1.68 +   if (marker >= APP0 && marker <= APP15) {
    1.69 +     const gchar *id_str = NULL;
    1.70 +@@ -561,7 +561,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse,
    1.71 + #else
    1.72 +   GST_DEBUG_OBJECT (parse, "unhandled marker %x skiping %u bytes", marker,
    1.73 +       size);
    1.74 +-#endif // GST_DISABLE_DEBUG
    1.75 ++#endif // GST_DISABLE_GST_DEBUG
    1.76 + 
    1.77 +   if (!gst_byte_reader_skip (reader, size - 2))
    1.78 +     return FALSE;
    1.79 +-- 
    1.80 +1.7.10
    1.81 +