Stephan Kulow 2014-07-27 06:24:47 +00:00 committed by Git OBS Bridge
commit 2e2c6cdac6
5 changed files with 82 additions and 75 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550
size 2538012

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5daed4b983b64e4e3fbe9cd29063e4302812cd03ba685a15b06a790911d04c1e
size 2618724

View File

@ -1,66 +0,0 @@
From 3e2add20f53d2543d495d32ab581e145be254013 Mon Sep 17 00:00:00 2001
From: Johannes Dewender <gnome@JonnyJD.net>
Date: Sat, 28 Sep 2013 13:19:02 +0200
Subject: [PATCH] bug 708991: fix MB discids for trailing data tracks
MusicBrainz removes trailing data tracks from releases on the server
and also for the calculation of the MusicBrainz Disc ID.
---
gst-libs/gst/audio/gstaudiocdsrc.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/gst-libs/gst/audio/gstaudiocdsrc.c b/gst-libs/gst/audio/gstaudiocdsrc.c
index 716ea0a..8296ab2 100644
--- a/gst-libs/gst/audio/gstaudiocdsrc.c
+++ b/gst-libs/gst/audio/gstaudiocdsrc.c
@@ -1189,13 +1189,23 @@ gst_audio_cd_src_calculate_musicbrainz_discid (GstAudioCdSrc * src)
gchar *ptr;
gchar tmp[9];
gulong i;
+ unsigned int last_audio_track;
guint leadout_sector;
gsize digest_len;
s = g_string_new (NULL);
+ /* MusicBrainz doesn't consider trailing data tracks
+ * data tracks up front stay, since the disc has to start with 1 */
+ last_audio_track = 0;
+ for (i = 0; i < src->priv->num_tracks; i++) {
+ if (src->priv->tracks[i].is_audio) {
+ last_audio_track = src->priv->tracks[i].num;
+ }
+ }
+
leadout_sector =
- src->priv->tracks[src->priv->num_tracks - 1].end + 1 + CD_MSF_OFFSET;
+ src->priv->tracks[last_audio_track - 1].end + 1 + CD_MSF_OFFSET;
/* generate SHA digest */
sha = g_checksum_new (G_CHECKSUM_SHA1);
@@ -1203,10 +1213,8 @@ gst_audio_cd_src_calculate_musicbrainz_discid (GstAudioCdSrc * src)
g_string_append_printf (s, "%02X", src->priv->tracks[0].num);
g_checksum_update (sha, (guchar *) tmp, 2);
- g_snprintf (tmp, sizeof (tmp), "%02X",
- src->priv->tracks[src->priv->num_tracks - 1].num);
- g_string_append_printf (s, " %02X",
- src->priv->tracks[src->priv->num_tracks - 1].num);
+ g_snprintf (tmp, sizeof (tmp), "%02X", last_audio_track);
+ g_string_append_printf (s, " %02X", last_audio_track);
g_checksum_update (sha, (guchar *) tmp, 2);
g_snprintf (tmp, sizeof (tmp), "%08X", leadout_sector);
@@ -1214,7 +1222,7 @@ gst_audio_cd_src_calculate_musicbrainz_discid (GstAudioCdSrc * src)
g_checksum_update (sha, (guchar *) tmp, 8);
for (i = 0; i < 99; i++) {
- if (i < src->priv->num_tracks) {
+ if (i < last_audio_track) {
guint frame_offset = src->priv->tracks[i].start + CD_MSF_OFFSET;
g_snprintf (tmp, sizeof (tmp), "%08X", frame_offset);
--
1.8.1.3

View File

@ -1,3 +1,77 @@
-------------------------------------------------------------------
Mon Jul 21 11:16:15 UTC 2014 - dimstar@opensuse.org
- Update to version 1.4.0:
+ Bugs fixed: bgo#733012, bgo#733349, bgo#733386.
+ Updated translations.
-------------------------------------------------------------------
Thu Jul 17 22:44:04 UTC 2014 - dimstar@opensuse.org
- Update to version 1.3.91:
+ Various API additions.
+ New plugins and elements:
- v4l2videodec element for accessing hardware codecs on
platforms that make them accessible via V4L2.
- New downloadbuffer element that replaces the download
buffering feature of queue2.
- rtpstreampay and rtpstreamdepay elements for transmitting RTP
packets over a stream API (e.g. TCP) according to RFC 4571.
- rtprtx elements for standard compliant implementation of
retransmissions, integrated into the rtpmanager plugin.
- audiomixer element that mixes multiple audio streams together
into a single one while keeping synchronization.
- OpenNI2 plugin for 3D cameras like the Kinect camera.
- OpenEXR plugin for decoding high-dynamic-range EXR images.
- curlsshsink and curlsftpsink to write files via SSH/SFTP.
- videosignal, ivfparse and sndfile plugins ported from 0.10.
- avfvideosrc, vtdec and other elements were ported from 0.10
and are available on OS X and iOS now.
+ Other changes:
- gst-libav now uses libav 10.1, and gained support for
H265/HEVC.
- Support for hardware codecs and special memory types has been
improved with bugfixes and feature additions in various
plugins and base classes.
- Various bugfixes and improvements to buffering in queue2 and
multiqueue elements.
- dvbsrc supports more delivery mechanisms and other features
now, including DVB S2 and T2 support.
- The MPEGTS library has support for many more descriptors.
- Major improvements to tsdemux and tsparse, especially time
and seeking related.
- souphttpsrc now has support for keep-alive connections,
compression, configurable number of retries and configuration
for SSL certificate validation.
- hlsdemux has undergone major refactoring and works more
reliable now and supports more HLS features like trick modes.
- dashdemux and mssdemux are now also pushing fragments
downstream while they're downloaded instead of waiting for
each fragment to finish.
- videoflip can automatically flip based on the orientation
tag.
- openjpeg supports the OpenJPEG2 API.
- waylandsink was refactored and should be more useful now.
- gst-rtsp-server supports SRTP and MIKEY now.
- gst-libav encoders are now negotiating any profile/level
settings with downstream via caps.
- Lots of fixes for coverity warnings all over the place.
- Negotiation related performance improvements.
- 800+ fixed bug reports.
+ Things to look out for:
- The eglglessink element was removed and replaced by the
glimagesink element.
- The mfcdec element was removed and replaced by v4l2videodec.
- osxvideosink is only available in OS X 10.6 or newer.
- On Android the namespace of the automatically generated Java
class for initialization of GStreamer has changed from
com.gstreamer to org.freedesktop.gstreamer to prevent
namespace pollution.
- On iOS you have to update your gst_ios_init.h and
gst_ios_init.m in your projects from the one included in the
binaries if you used the GnuTLS GIO module before.
- Drop gstreamer-plugins-base-discid.patch: fixed upstream.
-------------------------------------------------------------------
Fri Apr 25 11:32:58 UTC 2014 - dimstar@opensuse.org

View File

@ -18,7 +18,7 @@
Name: gstreamer-plugins-base
%define _name gst-plugins-base
Version: 1.2.4
Version: 1.4.0
Release: 0
%define gst_branch 1.0
Url: http://gstreamer.freedesktop.org/
@ -26,14 +26,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: GStreamer Streaming-Media Framework Plug-Ins
License: LGPL-2.1+ and GPL-2.0+
Group: Productivity/Multimedia/Other
Source: http://download.gnome.org/sources/gst-plugins-base/1.2/%{_name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/gst-plugins-base/1.4/%{_name}-%{version}.tar.xz
Source2: baselibs.conf
Patch0: aarch64-no-neon.patch
# PATCH-FIX-UPSTREAM gstreamer-plugins-base-discid.patch bnc#872575 bgo#708991 dimstar@opensuse.org -- fix MB discids for trailing data tracks
Patch1: gstreamer-plugins-base-discid.patch
BuildRequires: cdparanoia-devel
BuildRequires: glib2-devel >= 2.32
BuildRequires: gstreamer-devel >= 1.0.10
BuildRequires: gstreamer-devel >= 1.4.0
BuildRequires: gstreamer-utils > 0.11
BuildRequires: gtk-doc >= 1.12
BuildRequires: libICE-devel
@ -426,7 +424,6 @@ package.
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
translation-update-upstream po gst-plugins-base-%{gst_branch}
%build
@ -496,6 +493,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%doc AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS
%{_bindir}/gst-device-monitor-%{gst_branch}
%{_bindir}/gst-discoverer-%{gst_branch}
%{_bindir}/gst-play-%{gst_branch}
%{_libdir}/gstreamer-%{gst_branch}/libgstadder.so
@ -529,6 +527,7 @@ rm -rf $RPM_BUILD_ROOT
#Moved to -bad for now... likely to come pack later
#%{_libdir}/gstreamer-%{gst_branch}/libgstgdp.so
%{_libdir}/gstreamer-%{gst_branch}/libgstencodebin.so
%doc %{_mandir}/man1/gst-device-monitor-*
%doc %{_mandir}/man1/gst-discoverer-*
%doc %{_mandir}/man1/gst-play-*