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
669d2f81
Commit
669d2f81
authored
Aug 03, 2006
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Yet another x264 contrib patch for win32
parent
a3139ceb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
24 deletions
+21
-24
extras/contrib/src/Patches/x264-svn-win32.patch
extras/contrib/src/Patches/x264-svn-win32.patch
+21
-24
No files found.
extras/contrib/src/Patches/x264-svn-win32.patch
View file @
669d2f81
Index: configure
===================================================================
--- configure (revision 538)
+++ configure (working copy)
@@ -7,6 +7,7 @@
echo "available options:"
echo ""
echo " --help print this message"
+echo " --crosscompile=ARCH crosscompile for ARCH"
echo " --enable-avis-input enables avisynth input (win32 only)"
echo " --enable-mp4-output enables mp4 output (using gpac)"
echo " --enable-vfw compiles the VfW frontend"
@@ -64,48 +65,147 @@
--- configure (rvision 547)
+++ configure (copie de travail)
@@ -66,48 +66,147 @@
EXE=""
...
...
@@ -168,7 +160,7 @@ Index: configure
SYS="SunOS"
CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
LDFLAGS="$LDFLAGS -lm"
@@ -11
7,9 +217
,8 @@
@@ -11
9,9 +218
,8 @@
;;
esac
...
...
@@ -179,7 +171,7 @@ Index: configure
ARCH="X86"
CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
AS="nasm"
@@ -14
0,7 +239
,7 @@
@@ -14
2,7 +240
,7 @@
AS="yasm"
ASFLAGS="-f elf -m amd64"
;;
...
...
@@ -188,12 +180,11 @@ Index: configure
ARCH="PPC"
if [ $SYS = MACOSX ]
then
@@ -188,90 +287,7 @@
@@ -191,95 +289,6 @@
CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
-
# parse options
# parse options
-
-for opt do
- optarg="${opt#*=}"
- case "$opt" in
...
...
@@ -259,6 +250,12 @@ Index: configure
- --disable-vfw)
- vfw="no"
- ;;
- --enable-gtk)
- gtk="yes"
- ;;
- --disable-gtk)
- gtk="no"
- ;;
- --enable-shared)
- shared="yes"
- if [ $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" ] ; then
...
...
@@ -279,9 +276,9 @@ Index: configure
# autodetect options that weren't forced nor disabled
if test "$pthread" = "auto" ; then
@@ -356,6 +372,9 @@
ASFLAGS=$ASFLAGS
@@ -365,6 +374,9 @@
VFW=$vfw
GTK=$gtk
EXE=$EXE
+AR=$AR
+AROPTS=$AROPTS
...
...
@@ -291,8 +288,8 @@ Index: configure
DEVNULL=$DEVNULL
Index: Makefile
===================================================================
--- Makefile (r
evision 538
)
+++ Makefile (
working copy
)
--- Makefile (r
vision 547
)
+++ Makefile (
copie de travail
)
@@ -64,8 +64,8 @@
default: $(DEP) x264$(EXE)
...
...
@@ -304,9 +301,9 @@ Index: Makefile
$(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
@@ -13
4,14 +134
,14 @@
distclean: clean
rm -f config.mak config.h vfw/build/cygwin/config.mak gtk/config.mak x264.pc
@@ -13
8,14 +138
,14 @@
rm -f config.mak config.h vfw/build/cygwin/config.mak x264.pc
$(MAKE) -C gtk distclean
-install: x264 $(SONAME)
+install: x264$(EXE)
...
...
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