Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
0cae7b17
Commit
0cae7b17
authored
Apr 13, 2009
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contribs: fix libcaca compilation on OSX/PPC
parent
b181de41
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
35 deletions
+3
-35
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+0
-3
extras/contrib/src/Patches/caca-osx-ppc.patch
extras/contrib/src/Patches/caca-osx-ppc.patch
+0
-29
extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch
extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch
+3
-3
No files found.
extras/contrib/src/Makefile
View file @
0cae7b17
...
@@ -1349,9 +1349,6 @@ ifdef HAVE_DARWIN_OS
...
@@ -1349,9 +1349,6 @@ ifdef HAVE_DARWIN_OS
#remove me at next libcaca upgrade
#remove me at next libcaca upgrade
patch
-p0
< Patches/caca_driver_cocoa.diff
patch
-p0
< Patches/caca_driver_cocoa.diff
patch
-p0
< Patches/caca_macosx.diff
patch
-p0
< Patches/caca_macosx.diff
ifndef
HAVE_DARWIN_OS_ON_INTEL
patch
-p0
< Patches/caca-osx-ppc.patch
endif
patch
-p0
< Patches/libcaca-osx-sdkofourchoice.patch
patch
-p0
< Patches/libcaca-osx-sdkofourchoice.patch
(
cd
$@
;
sed
-e
's%/Developer/SDKs/MacOSX10.4u.sdk%
$(MACOSX_SDK)
%'
-i
.orig configure
)
(
cd
$@
;
sed
-e
's%/Developer/SDKs/MacOSX10.4u.sdk%
$(MACOSX_SDK)
%'
-i
.orig configure
)
endif
endif
...
...
extras/contrib/src/Patches/caca-osx-ppc.patch
deleted
100644 → 0
View file @
b181de41
--- libcaca/configure.orig 2008-01-27 20:10:40.000000000 +0100
+++ libcaca/configure 2008-01-27 20:12:15.000000000 +0100
@@ -23285,22 +23285,16 @@
if test "${ac_cv_my_have_cocoa}" = "yes"; then
case x${target} in
xpowerpc*darwin*)
- # 10.3 needed to link with X11
- MACOSX_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
- GCC_VERSION=3.3
ARCH="-arch ppc"
- MACOSX_SDK_CFLAGS="-nostdinc -isystem ${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOSX_SDK}/usr/include"
- MACOSX_SDK_CXXFLAGS="-nostdinc++ -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++ -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++/ppc-darwin -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++/backward"
- MACOSX_SDK_LDFLAGS="-L${MACOSX_SDK}/usr/lib/gcc/darwin -L${MACOSX_SDK}/usr/lib/gcc/darwin/${GCC_VERSION} -L${MACOSX_SDK}/usr/lib"
;;
x*86*darwin*)
- MACOSX_SDK=/Developer/SDKs/MacOSX10.4u.sdk
- GCC_VERSION=4.0
ARCH="-arch i386"
- MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
- MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
;;
esac
+ MACOSX_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+ GCC_VERSION=4.0
+ MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
+ MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
CC=gcc-${GCC_VERSION}
CXX=g++-${GCC_VERSION}
MACOSX_SDK_FRAMEWORKS="-F${MACOSX_SDK}/System/Library/Frameworks"
extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch
View file @
0cae7b17
--- libcaca/configure 2007-11-29 11:36:50.000000000 +0100
--- libcaca
-0.99.beta13b
/configure 2007-11-29 11:36:50.000000000 +0100
+++ libcaca/configure 2009-0
1-04 00:06:45.000000000 +01
00
+++ libcaca/configure 2009-0
4-13 19:21:25.000000000 +02
00
@@ -23283,26 +23283,9 @@
@@ -23283,26 +23283,9 @@
done
done
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
- esac
- esac
- CC=gcc-${GCC_VERSION}
- CC=gcc-${GCC_VERSION}
- CXX=g++-${GCC_VERSION}
- CXX=g++-${GCC_VERSION}
+ MACOSX_SDK=/Developer/SDKs/MacOSX10.
4u
.sdk
+ MACOSX_SDK=/Developer/SDKs/MacOSX10.
5
.sdk
+ MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
+ MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
+ MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
+ MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
MACOSX_SDK_FRAMEWORKS="-F${MACOSX_SDK}/System/Library/Frameworks"
MACOSX_SDK_FRAMEWORKS="-F${MACOSX_SDK}/System/Library/Frameworks"
...
...
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