external/libogg-1.3.2.patch
author Ozkan Sezer
Tue, 17 Dec 2019 21:56:50 +0300
changeset 1091 8a09f3c0c340
parent 830 c292b484a95e
permissions -rw-r--r--
add patch note for Mix_MusicDuration addition
slouken@830
     1
diff -ruN libogg-1.3.2.orig/android/ogg/config_types.h libogg-1.3.2/android/ogg/config_types.h
slouken@830
     2
--- libogg-1.3.2.orig/android/ogg/config_types.h	1969-12-31 16:00:00.000000000 -0800
slouken@830
     3
+++ libogg-1.3.2/android/ogg/config_types.h	2017-10-12 20:31:47.848694044 -0700
slouken@830
     4
@@ -0,0 +1,25 @@
slouken@830
     5
+#ifndef __CONFIG_TYPES_H__
slouken@830
     6
+#define __CONFIG_TYPES_H__
slouken@830
     7
+
slouken@830
     8
+/* these are filled in by configure */
slouken@830
     9
+#define INCLUDE_INTTYPES_H 1
slouken@830
    10
+#define INCLUDE_STDINT_H 1
slouken@830
    11
+#define INCLUDE_SYS_TYPES_H 1
slouken@830
    12
+
slouken@830
    13
+#if INCLUDE_INTTYPES_H
slouken@830
    14
+#  include <inttypes.h>
slouken@830
    15
+#endif
slouken@830
    16
+#if INCLUDE_STDINT_H
slouken@830
    17
+#  include <stdint.h>
slouken@830
    18
+#endif
slouken@830
    19
+#if INCLUDE_SYS_TYPES_H
slouken@830
    20
+#  include <sys/types.h>
slouken@830
    21
+#endif
slouken@830
    22
+
slouken@830
    23
+typedef int16_t ogg_int16_t;
slouken@830
    24
+typedef uint16_t ogg_uint16_t;
slouken@830
    25
+typedef int32_t ogg_int32_t;
slouken@830
    26
+typedef uint32_t ogg_uint32_t;
slouken@830
    27
+typedef int64_t ogg_int64_t;
slouken@830
    28
+
slouken@830
    29
+#endif
slouken@830
    30
diff -ruN libogg-1.3.2.orig/Android.mk libogg-1.3.2/Android.mk
slouken@830
    31
--- libogg-1.3.2.orig/Android.mk	1969-12-31 16:00:00.000000000 -0800
slouken@830
    32
+++ libogg-1.3.2/Android.mk	2017-10-22 11:48:30.793339994 -0700
slouken@830
    33
@@ -0,0 +1,17 @@
slouken@830
    34
+LOCAL_PATH := $(call my-dir)
slouken@830
    35
+
slouken@830
    36
+include $(CLEAR_VARS)
slouken@830
    37
+
slouken@830
    38
+LOCAL_MODULE := ogg
slouken@830
    39
+
slouken@830
    40
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/android
slouken@830
    41
+
slouken@830
    42
+LOCAL_CFLAGS :=
slouken@830
    43
+
slouken@830
    44
+LOCAL_SRC_FILES += \
slouken@830
    45
+    src/framing.c \
slouken@830
    46
+    src/bitwise.c
slouken@830
    47
+
slouken@830
    48
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
slouken@830
    49
+
slouken@830
    50
+include $(BUILD_STATIC_LIBRARY)
slouken@830
    51
diff -ruN libogg-1.3.2.orig/macosx/Ogg.xcodeproj/project.pbxproj libogg-1.3.2/macosx/Ogg.xcodeproj/project.pbxproj
slouken@830
    52
--- libogg-1.3.2.orig/macosx/Ogg.xcodeproj/project.pbxproj	2014-05-27 12:52:34.000000000 -0700
slouken@830
    53
+++ libogg-1.3.2/macosx/Ogg.xcodeproj/project.pbxproj	2017-10-22 11:30:36.440344213 -0700
slouken@830
    54
@@ -168,11 +168,19 @@
slouken@745
    55
 /* Begin PBXProject section */
slouken@745
    56
 		0867D690FE84028FC02AAC07 /* Project object */ = {
slouken@745
    57
 			isa = PBXProject;
slouken@745
    58
+			attributes = {
slouken@745
    59
+			};
slouken@745
    60
 			buildConfigurationList = 730F235809181A3A00AB638C /* Build configuration list for PBXProject "Ogg" */;
slouken@830
    61
+			compatibilityVersion = "Xcode 2.4";
slouken@745
    62
+			developmentRegion = en;
slouken@745
    63
 			hasScannedForEncodings = 1;
slouken@830
    64
+			knownRegions = (
slouken@830
    65
+				en,
slouken@830
    66
+			);
slouken@830
    67
 			mainGroup = 0867D691FE84028FC02AAC07 /* Ogg */;
slouken@830
    68
 			productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;
slouken@830
    69
 			projectDirPath = "";
slouken@830
    70
+			projectRoot = "";
slouken@830
    71
 			targets = (
slouken@830
    72
 				8D07F2BC0486CC7A007CD1D0 /* Ogg */,
slouken@830
    73
 				734FB2E40B18B33E00D561D7 /* libogg (static) */,
slouken@830
    74
@@ -237,9 +245,10 @@
slouken@745
    75
 		730F235509181A3A00AB638C /* Debug */ = {
slouken@745
    76
 			isa = XCBuildConfiguration;
slouken@745
    77
 			buildSettings = {
slouken@745
    78
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
slouken@745
    79
 				COPY_PHASE_STRIP = NO;
slouken@830
    80
-				DYLIB_COMPATIBILITY_VERSION = 1;
slouken@830
    81
-				DYLIB_CURRENT_VERSION = 1;
slouken@830
    82
+				DYLIB_COMPATIBILITY_VERSION = 9.0.0;
slouken@745
    83
+				DYLIB_CURRENT_VERSION = 9.2.0;
slouken@745
    84
 				FRAMEWORK_VERSION = A;
slouken@745
    85
 				GCC_DYNAMIC_NO_PIC = NO;
slouken@745
    86
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
slouken@830
    87
@@ -248,7 +257,10 @@
slouken@830
    88
 				GCC_PREFIX_HEADER = Ogg_Prefix.pch;
slouken@745
    89
 				INFOPLIST_FILE = Info.plist;
slouken@745
    90
 				INSTALL_PATH = /Library/Frameworks;
slouken@830
    91
+				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
slouken@745
    92
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
slouken@745
    93
 				PRODUCT_NAME = Ogg;
slouken@830
    94
+				SDKROOT = macosx;
slouken@745
    95
 				WRAPPER_EXTENSION = framework;
slouken@830
    96
 				ZERO_LINK = YES;
slouken@830
    97
 			};
slouken@830
    98
@@ -257,9 +269,10 @@
slouken@745
    99
 		730F235609181A3A00AB638C /* Release */ = {
slouken@745
   100
 			isa = XCBuildConfiguration;
slouken@745
   101
 			buildSettings = {
slouken@745
   102
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
slouken@745
   103
 				COPY_PHASE_STRIP = YES;
slouken@830
   104
-				DYLIB_COMPATIBILITY_VERSION = 1;
slouken@830
   105
-				DYLIB_CURRENT_VERSION = 1;
slouken@830
   106
+				DYLIB_COMPATIBILITY_VERSION = 9.0.0;
slouken@745
   107
+				DYLIB_CURRENT_VERSION = 9.2.0;
slouken@745
   108
 				FRAMEWORK_VERSION = A;
slouken@745
   109
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
slouken@745
   110
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
slouken@830
   111
@@ -267,7 +280,10 @@
slouken@830
   112
 				GCC_PREFIX_HEADER = Ogg_Prefix.pch;
slouken@745
   113
 				INFOPLIST_FILE = Info.plist;
slouken@745
   114
 				INSTALL_PATH = /Library/Frameworks;
slouken@830
   115
+				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
slouken@745
   116
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
slouken@745
   117
 				PRODUCT_NAME = Ogg;
slouken@830
   118
+				SDKROOT = macosx;
slouken@745
   119
 				WRAPPER_EXTENSION = framework;
slouken@830
   120
 				ZERO_LINK = NO;
slouken@830
   121
 			};