Accepting request 1316398 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/1316398
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libogg?expand=0&rev=37

lib64.dif

@@ -1,16 +0,0 @@
-Index: ogg.m4
-===================================================================
---- ogg.m4.orig
-+++ ogg.m4
-@@ -19,9 +19,9 @@ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--
-   elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
-     OGG_LIBS=""
-   elif test "x$ogg_prefix" != "x" ; then
--    OGG_LIBS="-L$ogg_prefix/lib"
-+    OGG_LIBS="-L$ogg_prefix/lib64"
-   elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr"; then
--    OGG_LIBS="-L$prefix/lib"
-+    OGG_LIBS="-L$prefix/lib64"
-   fi
- 
-   if test "x$ogg_prefix" != "xno" ; then

libogg-1.3.6.tar.xz

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

libogg.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Nov  4 19:31:26 UTC 2025 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 1.3.6
+  * Update minimum cmake version to 3.6.
+  * Fix UBsan issues.
+  * Improve allocation failure handling.
+  * Fix various compiler warnings.
+- Use CMake instead of autotools.
+- Use ldconfig_scriptlets macro.
+- Drop not longer needed patches:
+  * lib64.dif
+  * m4.diff
+
 -------------------------------------------------------------------
 Thu Feb 29 18:33:27 UTC 2024 - pgajdos@suse.com
 

libogg.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libogg
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %define _SO_nr 0
 Name:           libogg
-Version:        1.3.5
+Version:        1.3.6
 Release:        0
 Summary:        Ogg Bitstream Library
 License:        BSD-3-Clause
@@ -26,8 +26,7 @@ Group:          Development/Libraries/C and C++
 URL:            https://xiph.org/vorbis/
 Source:         https://downloads.xiph.org/releases/ogg/%{name}-%{version}.tar.xz
 Source2:        baselibs.conf
-Patch1:         lib64.dif
-Patch2:         m4.diff
+BuildRequires:  cmake
 BuildRequires:  pkgconfig
 BuildRequires:  xz
 
@@ -60,29 +59,19 @@ This package contains all necessary include files and libraries needed
 to compile and develop applications that use libogg.
 
 %prep
-%setup -q
-%patch -P 2
-if [ "%{_lib}" == "lib64" ]; then
-%patch -P 1
-fi
+%autosetup -p1
 
 %build
-# Fix optimization level
-sed -i s,-O20,-O3,g configure
-
-%configure --disable-static
-%make_build
+%cmake
+%cmake_build
 
 %install
-%make_install docdir="%{_docdir}/%{name}-devel"
-# remove unneeded files
-find %{buildroot} -type f -name "*.la" -delete -print
+%cmake_install
 
 %check
-%make_build check
+%ctest
 
-%post -n libogg%{_SO_nr} -p /sbin/ldconfig
-%postun -n libogg%{_SO_nr} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libogg%{_SO_nr}
 
 %files -n libogg%{_SO_nr}
 %doc AUTHORS CHANGES README.md
@@ -90,11 +79,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/libogg.so.%{_SO_nr}*
 
 %files devel
-%{_docdir}/%{name}-devel
+%{_docdir}/%{name}
 %{_includedir}/ogg
 %{_libdir}/libogg.so
-%dir %{_datadir}/aclocal
-%{_datadir}/aclocal/ogg.m4
+%{_libdir}/cmake/Ogg
 %{_libdir}/pkgconfig/ogg.pc
 
 %changelog

m4.diff

@@ -1,31 +0,0 @@
-Index: ogg.m4
-===================================================================
---- ogg.m4.orig
-+++ ogg.m4
-@@ -20,7 +20,7 @@ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--
-     OGG_LIBS=""
-   elif test "x$ogg_prefix" != "x" ; then
-     OGG_LIBS="-L$ogg_prefix/lib"
--  elif test "x$prefix" != "xNONE" ; then
-+  elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr"; then
-     OGG_LIBS="-L$prefix/lib"
-   fi
- 
-@@ -34,7 +34,7 @@ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--
-     OGG_CFLAGS=""
-   elif test "x$ogg_prefix" != "x" ; then
-     OGG_CFLAGS="-I$ogg_prefix/include"
--  elif test "x$prefix" != "xNONE"; then
-+  elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr"; then
-     OGG_CFLAGS="-I$prefix/include"
-   fi
- 
-@@ -62,7 +62,7 @@ dnl
- #include <string.h>
- #include <ogg/ogg.h>
- 
--int main ()
-+int main (void)
- {
-   system("touch conf.oggtest");
-   return 0;