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
c0125ee7
Commit
c0125ee7
authored
Sep 18, 2006
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* remove the patch and try a hacky, but supposed to be working fix by LordRPI
parent
52e7774e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
16 deletions
+1
-16
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+1
-3
extras/contrib/src/Patches/x264-svn-darwin_intel.patch
extras/contrib/src/Patches/x264-svn-darwin_intel.patch
+0
-13
No files found.
extras/contrib/src/Makefile
View file @
c0125ee7
...
...
@@ -124,6 +124,7 @@ endif
ifeq
($(HOST),i686-apple-darwin8)
FFMPEGCONF
+=
--enable-memalign-hack
X264CONF
+=
--extra-ldflags
=
-read_only_relocs
suppress
endif
ifdef
HAVE_DARWIN_OS
...
...
@@ -1191,9 +1192,6 @@ x264:
ifdef
HAVE_WIN32
(
cd
x264
;
patch
-p
0 < ../Patches/x264-svn-win32.patch
)
endif
ifeq
($(HOST),i686-apple-darwin8)
(
cd
x264
;
patch
-p
0 < ../Patches/x264-svn-darwin_intel.patch
)
endif
else
x264-$(X264_VERSION).tar.gz
:
$(WGET)
$(X264_URL)
...
...
extras/contrib/src/Patches/x264-svn-darwin_intel.patch
deleted
100644 → 0
View file @
52e7774e
Index: common/i386/i386inc.asm
===================================================================
--- common/i386/i386inc.asm (revision 564)
+++ common/i386/i386inc.asm (working copy)
@@ -41,7 +41,7 @@
; section instead until NASM is fixed.
%macro SECTION_RODATA 0
%ifidn __OUTPUT_FORMAT__,macho
- SECTION .text
+ SECTION .text align=16
fakegot:
%else
SECTION .rodata data align=16
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