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
648b747e
Commit
648b747e
authored
Apr 10, 2006
by
Damien Fouilleul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- update win32 patch for libpng-1.2.8
parent
0d9b57b9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+1
-1
extras/contrib/src/Patches/libpng-win32.patch
extras/contrib/src/Patches/libpng-win32.patch
+10
-7
No files found.
extras/contrib/src/Makefile
View file @
648b747e
...
@@ -1400,7 +1400,7 @@ libpng-$(PNG_VERSION).tar.bz2:
...
@@ -1400,7 +1400,7 @@ libpng-$(PNG_VERSION).tar.bz2:
libpng
:
libpng-$(PNG_VERSION).tar.bz2
libpng
:
libpng-$(PNG_VERSION).tar.bz2
$(EXTRACT_BZ2)
$(EXTRACT_BZ2)
ifdef
HAVE_WIN32
ifdef
HAVE_WIN32
(
cd
$@
;
cat
../Patches/libpng-
1.2.5-
win32.patch |
sed
s,??PREFIX??,
$(PREFIX)
, | patch
-p0
)
(
cd
$@
;
cat
../Patches/libpng-win32.patch |
sed
s,??PREFIX??,
$(PREFIX)
, | patch
-p0
)
else
else
(
cat
Patches/libpng-osx.patch |
sed
-e
's%??PREFIX??%
$(PREFIX)
%'
-e
's%??EXTRA_CFLAGS??%
$(EXTRA_CFLAGS)
%'
-e
's%??EXTRA_LDFLAGS??%
$(EXTRA_LDFLAGS)
%'
| patch
-p0
)
(
cat
Patches/libpng-osx.patch |
sed
-e
's%??PREFIX??%
$(PREFIX)
%'
-e
's%??EXTRA_CFLAGS??%
$(EXTRA_CFLAGS)
%'
-e
's%??EXTRA_LDFLAGS??%
$(EXTRA_LDFLAGS)
%'
| patch
-p0
)
endif
endif
...
...
extras/contrib/src/Patches/libpng-
1.2.5-
win32.patch
→
extras/contrib/src/Patches/libpng-win32.patch
View file @
648b747e
diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
--- scripts/makefile.cygwin 2004-12-03 00:14:31.000000000 +0000
--- scripts/makefile.cygwin 2002-10-03 12:32:34.000000000 +0100
+++ scripts/makefile.cygwin 2006-04-09 17:56:32.203125000 +0100
+++ scripts/makefile.cygwin 2003-07-25 11:03:42.000000000 +0100
@@ -35,7 +35,6 @@
@@ -35,7 +35,6 @@
# $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
# $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
# list at the bottom of this makefile.
# list at the bottom of this makefile.
...
@@ -9,7 +8,7 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
...
@@ -9,7 +8,7 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
ifdef MINGW
ifdef MINGW
MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
@@ -43,13 +4
3
,12 @@
@@ -43,13 +4
2
,12 @@
# Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h
# Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h
ifndef prefix
ifndef prefix
...
@@ -26,7 +25,7 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
...
@@ -26,7 +25,7 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
#ZLIBLIB=../zlib
#ZLIBLIB=../zlib
#ZLIBINC=../zlib
#ZLIBINC=../zlib
@@ -94,7 +9
4
,9 @@
@@ -94,7 +9
2
,9 @@
LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
MKDIR=/bin/mkdir -pv
MKDIR=/bin/mkdir -pv
...
@@ -36,7 +35,7 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
...
@@ -36,7 +35,7 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
#RANLIB=echo
#RANLIB=echo
INCPATH=$(prefix)/include
INCPATH=$(prefix)/include
@@ -173,
7 +173,7
@@
@@ -173,
10 +173,10
@@
$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
$(STATLIB): $(OBJS)
$(STATLIB): $(OBJS)
...
@@ -44,4 +43,8 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
...
@@ -44,4 +43,8 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
+ $(AR) rc $@ $(OBJS)
+ $(AR) rc $@ $(OBJS)
$(RANLIB) $@
$(RANLIB) $@
$(SHAREDDEF): projects/msvc/png32ms.def
-$(SHAREDDEF): scripts/png32ms.def
+$(SHAREDDEF): scripts/pngw32.def
cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \
sed -e 's/\([^;]*\);/;/' > $@
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