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