Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
349fa35a
Commit
349fa35a
authored
Jun 10, 2006
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Patch ffmpeg configure to not use twice the cross prefix.
* CVS -> SVN
parent
03562f42
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
4 deletions
+26
-4
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+7
-4
extras/contrib/src/Patches/ffmpeg-svn-beos.patch
extras/contrib/src/Patches/ffmpeg-svn-beos.patch
+0
-0
extras/contrib/src/Patches/ffmpeg-svn-cross.patch
extras/contrib/src/Patches/ffmpeg-svn-cross.patch
+19
-0
extras/contrib/src/Patches/ffmpeg-svn-mactel.patch
extras/contrib/src/Patches/ffmpeg-svn-mactel.patch
+0
-0
extras/contrib/src/Patches/ffmpeg-svn-win32.patch
extras/contrib/src/Patches/ffmpeg-svn-win32.patch
+0
-0
extras/contrib/src/Patches/ffmpeg-svn-wince.patch
extras/contrib/src/Patches/ffmpeg-svn-wince.patch
+0
-0
No files found.
extras/contrib/src/Makefile
View file @
349fa35a
...
...
@@ -894,16 +894,19 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
ffmpeg
:
$(SVN)
co
$(FFMPEG_SVN)
ffmpeg
ifeq
($(HOST),i586-pc-beos)
(
cd
$@
;
patch
-p
0 < ../Patches/ffmpeg-
cvs
-beos.patch
)
(
cd
$@
;
patch
-p
0 < ../Patches/ffmpeg-
svn
-beos.patch
)
endif
ifdef
HAVE_WIN32
patch
-p
0 < Patches/ffmpeg-
cvs
-win32.patch
patch
-p
0 < Patches/ffmpeg-
svn
-win32.patch
endif
ifdef
HAVE_WINCE
patch
-p
1 < Patches/ffmpeg-
cvs
-wince.patch
patch
-p
1 < Patches/ffmpeg-
svn
-wince.patch
endif
ifeq
($(HOST),i686-apple-darwin8)
(
cd
$@
;
patch
-p
0 < ../Patches/ffmpeg-cvs-mactel.patch
)
(
cd
$@
;
patch
-p
0 < ../Patches/ffmpeg-svn-mactel.patch
)
endif
ifneq
($(HOST),$(BUILD))
patch
-p
0 < Patches/ffmpeg-svn-cross.patch
endif
ffmpeg-$(FFMPEG_VERSION).tar.gz
:
...
...
extras/contrib/src/Patches/ffmpeg-
cvs
-beos.patch
→
extras/contrib/src/Patches/ffmpeg-
svn
-beos.patch
View file @
349fa35a
File moved
extras/contrib/src/Patches/ffmpeg-svn-cross.patch
0 → 100644
View file @
349fa35a
Index: ffmpeg/configure
===================================================================
--- ffmpeg/configure (revision 5464)
+++ ffmpeg/configure (working copy)
@@ -129,12 +129,12 @@
check_cc(){
cat >$TMPC
- ${cross_prefix}$cc $CFLAGS "$@" -c -o $TMPO $TMPC >/dev/null 2>&1
+ $cc $CFLAGS "$@" -c -o $TMPO $TMPC >/dev/null 2>&1
}
check_ld(){
cat >$TMPC
- ${cross_prefix}$cc $CFLAGS $LDFLAGS "$@" -o $TMPE $TMPC $extralibs >/dev/null 2>&1
+ $cc $CFLAGS $LDFLAGS "$@" -o $TMPE $TMPC $extralibs >/dev/null 2>&1
}
check_cflags(){
extras/contrib/src/Patches/ffmpeg-
cvs
-mactel.patch
→
extras/contrib/src/Patches/ffmpeg-
svn
-mactel.patch
View file @
349fa35a
File moved
extras/contrib/src/Patches/ffmpeg-
cvs
-win32.patch
→
extras/contrib/src/Patches/ffmpeg-
svn
-win32.patch
View file @
349fa35a
File moved
extras/contrib/src/Patches/ffmpeg-
cvs
-wince.patch
→
extras/contrib/src/Patches/ffmpeg-
svn
-wince.patch
View file @
349fa35a
File moved
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