From 58e5e7bbe1be3fd049a6f256631136f9acca0929 Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.com>
Date: Sat, 16 Oct 2021 17:05:40 +0100
Subject: libogg: update to 1.3.5

---
 recipes/libogg.recipe                              |  7 ++--
 recipes/libogg/0001-Fix-iOS-build.patch            | 39 ----------------------
 .../0001-include-Use-stdint-on-mac-ios.patch       | 25 --------------
 3 files changed, 3 insertions(+), 68 deletions(-)
 delete mode 100644 recipes/libogg/0001-Fix-iOS-build.patch
 delete mode 100644 recipes/libogg/0001-include-Use-stdint-on-mac-ios.patch

(limited to 'recipes')

diff --git a/recipes/libogg.recipe b/recipes/libogg.recipe
index 7affaf4d..635a71f7 100644
--- a/recipes/libogg.recipe
+++ b/recipes/libogg.recipe
@@ -4,13 +4,12 @@ from cerbero.utils import shell
 
 class Recipe(recipe.Recipe):
     name = 'libogg'
-    version = '1.3.4'
+    version = '1.3.5'
     stype = SourceType.TARBALL
     url = 'xiph://ogg/%(name)s-%(version)s.tar.xz'
-    tarball_checksum = 'c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe'
+    tarball_checksum = 'c4d91be36fc8e54deae7575241e03f4211eb102afb3fc0775fbbc1b740016705'
     licenses = [{License.BSD_like: ['COPYING']}]
-    patches = ['libogg/0001-Fix-iOS-build.patch',
-               'libogg/0001-include-Use-stdint-on-mac-ios.patch']
+    patches = []
 
     files_libs = ['libogg']
     files_devel = ['include/ogg', 'lib/pkgconfig/ogg.pc', 'share/aclocal/ogg.m4']
diff --git a/recipes/libogg/0001-Fix-iOS-build.patch b/recipes/libogg/0001-Fix-iOS-build.patch
deleted file mode 100644
index 4304b3cb..00000000
--- a/recipes/libogg/0001-Fix-iOS-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b18e0655ea9d37a5e1c119735c8345778e196db9 Mon Sep 17 00:00:00 2001
-From: Thibault Saunier <thibault.saunier@collabora.com>
-Date: Fri, 25 Jan 2013 14:38:05 -0300
-Subject: [PATCH] Fix iOS build
-
----
- src/Makefile.am | 2 +-
- src/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d171fe7..de278b7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -9,7 +9,7 @@ libogg_la_LDFLAGS = -no-undefined -version-info @LIB_CURRENT@:@LIB_REVISION@:@LI
- 
- # build and run the self tests on 'make check'
- 
--noinst_PROGRAMS = test_bitwise test_framing
-+check_PROGRAMS = test_bitwise test_framing
- 
- test_bitwise_SOURCES = bitwise.c
- test_bitwise_CFLAGS = -D_V_SELFTEST
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 04a6070..e1cad37 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -89,7 +89,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--noinst_PROGRAMS = test_bitwise$(EXEEXT) test_framing$(EXEEXT)
-+check_PROGRAMS = test_bitwise$(EXEEXT) test_framing$(EXEEXT)
- subdir = src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
--- 
-2.27.0.windows.1
-
diff --git a/recipes/libogg/0001-include-Use-stdint-on-mac-ios.patch b/recipes/libogg/0001-include-Use-stdint-on-mac-ios.patch
deleted file mode 100644
index 6c55eca2..00000000
--- a/recipes/libogg/0001-include-Use-stdint-on-mac-ios.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 93ecf704a16f8bb4023e80e3c4f338c7a2fd4025 Mon Sep 17 00:00:00 2001
-From: Edward Hervey <edward@centricular.com>
-Date: Fri, 6 Sep 2019 12:12:16 +0200
-Subject: [PATCH] include: Use stdint on mac/ios
-
----
- include/ogg/os_types.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/ogg/os_types.h b/include/ogg/os_types.h
-index eb8a322..6aeecae 100644
---- a/include/ogg/os_types.h
-+++ b/include/ogg/os_types.h
-@@ -70,7 +70,7 @@
- 
- #elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
- 
--#  include <sys/types.h>
-+#  include <stdint.h>
-    typedef int16_t ogg_int16_t;
-    typedef uint16_t ogg_uint16_t;
-    typedef int32_t ogg_int32_t;
--- 
-2.21.0
-
-- 
cgit v1.2.3