Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
1a9c88e2
Commit
1a9c88e2
authored
Nov 19, 2010
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix libogg build on OSX (patch taken from upstream)
remove obsolete patch forgotten in [
4b6e13d3
]
parent
5ac972d7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
16 deletions
+16
-16
extras/contrib/src/Patches/libogg-inttypes.patch
extras/contrib/src/Patches/libogg-inttypes.patch
+0
-16
extras/contrib/src/Patches/libogg-r17608.diff
extras/contrib/src/Patches/libogg-r17608.diff
+15
-0
extras/contrib/src/contrib-src.mak
extras/contrib/src/contrib-src.mak
+1
-0
No files found.
extras/contrib/src/Patches/libogg-inttypes.patch
deleted
100644 → 0
View file @
5ac972d7
diff -ruN libogg.orig/include/ogg/os_types.h libogg/include/ogg/os_types.h
--- libogg.orig/include/ogg/os_types.h 2004-09-23 15:26:58.000000000 +0200
+++ libogg/include/ogg/os_types.h 2005-08-25 18:42:01.000000000 +0200
@@ -120,6 +120,12 @@
#else
# include <sys/types.h>
+#if defined( HAVE_INTTYPES_H )
+# include <inttypes.h>
+#endif
+#if defined( HAVE_STDINT_H )
+# include <stdint.h>
+#endif
# include <ogg/config_types.h>
#endif
extras/contrib/src/Patches/libogg-r17608.diff
0 → 100644
View file @
1a9c88e2
https://trac.xiph.org/changeset/17608/trunk/ogg/include/ogg/os_types.h?format=diff&new=17608
Index: trunk/ogg/include/ogg/os_types.h
===================================================================
--- trunk/ogg/include/ogg/os_types.h (revision 17566)
+++ trunk/ogg/include/ogg/os_types.h (revision 17608)
@@ -71,7 +71,7 @@
# include <inttypes.h>
typedef int16_t ogg_int16_t;
- typedef u_int16_t ogg_uint16_t;
+ typedef uint16_t ogg_uint16_t;
typedef int32_t ogg_int32_t;
- typedef u_int32_t ogg_uint32_t;
+ typedef uint32_t ogg_uint32_t;
typedef int64_t ogg_int64_t;
extras/contrib/src/contrib-src.mak
View file @
1a9c88e2
...
@@ -598,6 +598,7 @@ libogg-$(OGG_VERSION).tar.gz:
...
@@ -598,6 +598,7 @@ libogg-$(OGG_VERSION).tar.gz:
libogg
:
libogg-$(OGG_VERSION).tar.gz
libogg
:
libogg-$(OGG_VERSION).tar.gz
$(EXTRACT_GZ)
$(EXTRACT_GZ)
patch
-p0
< Patches/libogg-1.1.patch
patch
-p0
< Patches/libogg-1.1.patch
(
cd
$@
;
patch
-p2
< ../Patches/libogg-r17608.diff
)
ifdef
HAVE_WINCE
ifdef
HAVE_WINCE
patch
-p0
< Patches/libogg-wince.patch
patch
-p0
< Patches/libogg-wince.patch
endif
endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment