Accepting request 1279724 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/1279724
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vorbis-tools?expand=0&rev=33

vorbis-tools-1.4.2.tar.gz

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

vorbis-tools-1.4.3.tar.gz

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

vorbis-tools-CVE-2023-43361.patch

@@ -1,61 +0,0 @@
-From 69dfbe06ce02e6199444245397acf79fb6857b4c Mon Sep 17 00:00:00 2001
-From: Ralph Giles <giles@thaumas.net>
-Date: Sun, 17 Sep 2023 11:49:12 -0700
-Subject: [PATCH] oggenc: Don't assume the output path ends in a file name.
-
-oggenc attempts to create any specified directories in the output
-file path if they don't exist. The parser was assuming there was
-a final filename after the last directory separator, and so would
-try to read off the end of the argument if it was a bare directory
-such as `./` or `outdir/`. This adds a check to make sure the
-scan isn't starting off the end of the path string.
-
-Thanks to Frank-Z7 (Zeng Yunxiang) at Huazhong University of Science
-and Technology (cse.hust.edu.cn) for the report.
----
- oggenc/platform.c | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/oggenc/platform.c b/oggenc/platform.c
-index 6d9f4ef..ee0b7ce 100644
---- a/oggenc/platform.c
-+++ b/oggenc/platform.c
-@@ -136,18 +136,23 @@ int create_directories(char *fn, int isutf8)
- {
-     char *end, *start;
-     struct stat statbuf;
--    char *segment = malloc(strlen(fn)+1);
-+    const size_t fn_len = strlen(fn);
-+    char *segment = malloc(fn_len+1);
- #ifdef _WIN32
-     wchar_t seg[MAX_PATH+1];
- #endif
- 
-     start = fn;
- #ifdef _WIN32
--    if(strlen(fn) >= 3 && isalpha(fn[0]) && fn[1]==':')
-+    // Strip drive prefix
-+    if(fn_len >= 3 && isalpha(fn[0]) && fn[1]==':') {
-         start = start+2;
-+    }
- #endif
- 
--    while((end = strpbrk(start+1, PATH_SEPS)) != NULL)
-+    // Loop through path segments, creating directories if necessary
-+    while((start+1 - fn < fn_len) &&
-+          (end = strpbrk(start+1, PATH_SEPS)) != NULL)
-     {
-         int rv;
-         memcpy(segment, fn, end-fn);
-@@ -159,7 +164,7 @@ int create_directories(char *fn, int isutf8)
-             rv = _wstat(seg,&statbuf);
-         } else
- #endif
--            rv = stat(segment,&statbuf);
-+        rv = stat(segment, &statbuf);
-         if(rv) {
-             if(errno == ENOENT) {
- #ifdef _WIN32
--- 
-GitLab
-

vorbis-tools-cflags.diff

@@ -1,15 +0,0 @@
---- configure.ac	2010-03-26 09:07:07.000000000 +0200
-+++ configure.ac.new	2011-03-06 14:57:31.446178384 +0200
-@@ -66,9 +66,9 @@
- else
-         case $host in
-         *-*-linux*)
--                DEBUG="-g -Wall -fsigned-char"
--                CFLAGS="-O2 -Wall -ffast-math -fsigned-char"
--                PROFILE="-Wall -W -pg -g -O2 -ffast-math -fsigned-char"
-+                DEBUG="-g -Wall"
-+                CFLAGS="-O2 -Wall -ffast-math"
-+                PROFILE="-Wall -W -pg -g -O2 -ffast-math"
-                 ;;
-         sparc-sun-*)
-                 DEBUG="-g -Wall -fsigned-char -mv8"

vorbis-tools-gcc14.patch

@@ -1,12 +0,0 @@
-Index: vorbis-tools-1.4.2/ogginfo/codec_skeleton.c
-===================================================================
---- vorbis-tools-1.4.2.orig/ogginfo/codec_skeleton.c
-+++ vorbis-tools-1.4.2/ogginfo/codec_skeleton.c
-@@ -24,6 +24,7 @@
- 
- #include <ogg/ogg.h>
- 
-+#include "utf8.h"
- #include "i18n.h"
- 
- #include "private.h"

vorbis-tools.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat May 24 06:11:20 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 1.4.3:
+  * handle disappearing audio device more gracefully
+  * Compiler and portability fixes
+  * Fixed memory leaks
+  * Update translations
+- drop patches included upstream or not required:
+  * vorbis-tools-CVE-2023-43361.patch
+  * vorbis-tools-cflags.diff
+  * vorbis-tools-gcc14.patch
+
 -------------------------------------------------------------------
 Tue May 14 14:03:09 UTC 2024 - Marcus Meissner <meissner@suse.com>
 

vorbis-tools.spec

@@ -2,6 +2,7 @@
 # spec file for package vorbis-tools
 #
 # Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,28 +18,23 @@
 
 
 Name:           vorbis-tools
-Version:        1.4.2
+Version:        1.4.3
 Release:        0
 Summary:        Ogg Vorbis Tools
 License:        GPL-2.0-only
 Group:          Productivity/Multimedia/Sound/Utilities
 URL:            https://www.xiph.org/
 Source0:        https://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.gz
-# PATCH-FIX-OPENSUSE vorbis-tools-cflags.diff bnc#93888 -- Remove -fsigned-char option
-Patch1:         vorbis-tools-cflags.diff
-# PATCH-FIX-UPSTREAM bsc#1215942 CVE-2023-43361
-Patch2:         vorbis-tools-CVE-2023-43361.patch
-# PATCH-FIX-OPENSUSE  vorbis-tools-cflags.diff -- fix gcc14 issues
-Patch3:         vorbis-tools-gcc14.patch
-BuildRequires:  flac-devel
 BuildRequires:  gettext-tools
-BuildRequires:  libao-devel
-BuildRequires:  libcurl-devel
-BuildRequires:  libkate-devel
-BuildRequires:  libtool
-BuildRequires:  libvorbis-devel
 BuildRequires:  pkgconfig
-BuildRequires:  speex-devel
+BuildRequires:  pkgconfig(ao) >= 1.0.0
+BuildRequires:  pkgconfig(flac)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(oggkate)
+BuildRequires:  pkgconfig(opus)
+BuildRequires:  pkgconfig(speex)
+BuildRequires:  pkgconfig(vorbis) >= 1.3.0
 
 %description
 This package contains some tools for Ogg Vorbis:
@@ -51,44 +47,27 @@ vcut (which allows you to cut up Vorbis files).
 %lang_package
 
 %prep
-%setup -q
-%patch -P 1
-%patch -P 2 -p1
-%patch -P 3 -p1
+%autosetup -p1
 
 %build
-# Because of patch vorbis-tools-cflags.diff regenerate build system
-cp %{_datadir}/gettext/config.rpath .
-autoreconf --force --install
-export CFLAGS="%{optflags} -fPIE"
-export LDFLAGS="-pie"
-%configure --disable-rpath
+%configure
 %make_build
 
 %install
 %make_install
-
-# Remove unneeded files (they will be included in /usr/share/doc/packages/vorbis-tools/)
-rm -rf %{buildroot}%{_datadir}/doc/%{name}-%{version}/
+rm %{buildroot}%{_datadir}/doc/vorbis-tools/ogg123rc-example
 %find_lang %{name}
 
+%check
+%make_build check
+
 %files
 %license COPYING
 %doc AUTHORS CHANGES README
-%doc ogg123/ogg123rc-example
-%{_bindir}/ogg123
-%{_bindir}/oggdec
-%{_bindir}/oggenc
-%{_bindir}/ogginfo
-%{_bindir}/vcut
-%{_bindir}/vorbiscomment
-%{_mandir}/man1/ogg123.1%{?ext_man}
-%{_mandir}/man1/oggdec.1%{?ext_man}
-%{_mandir}/man1/oggenc.1%{?ext_man}
-%{_mandir}/man1/ogginfo.1%{?ext_man}
-%{_mandir}/man1/vcut.1%{?ext_man}
-%{_mandir}/man1/vorbiscomment.1%{?ext_man}
+%{_bindir}/*
+%{_mandir}/man1/*.1%{?ext_man}
 
 %files lang -f %{name}.lang
+%license COPYING
 
 %changelog