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
0e839252
Commit
0e839252
authored
Jul 25, 2006
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade patch for png on osx. Thanks to Jean-Baptiste Kempf
parent
0e631744
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
19 deletions
+10
-19
extras/contrib/src/Patches/libpng-osx.patch
extras/contrib/src/Patches/libpng-osx.patch
+10
-19
No files found.
extras/contrib/src/Patches/libpng-osx.patch
View file @
0e839252
--- libpng
/scripts/makefile.darwin.orig 2004-12-03 00:14:31.000000000 +00
00
--- libpng
-1.2.12/scripts/makefile.darwin 2006-06-27 22:22:40.000000000 +02
00
+++ libpng/scripts/makefile.darwin 2006-0
4-10 21:55:35.000000000 +01
00
+++ libpng/scripts/makefile.darwin 2006-0
7-25 13:28:44.000000000 +02
00
@@ -7,7 +7,7 @@
@@ -7,7 +7,7 @@
# For conditions of distribution and use, see copyright notice in png.h
# For conditions of distribution and use, see copyright notice in png.h
# where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h
# where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h
-prefix=/usr/local
-prefix=/usr/local
+prefix=??PREFIX??
+prefix=??PREFIX??
exec_prefix=$(prefix)
# Where the zlib library and include files are located
# Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib
@@ -38,8 +38,8 @@
@@ -16,8 +16,8 @@
RANLIB=ranlib
ZLIBINC=../zlib
RM_F=/bin/rm -f
CC=cc
-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
+CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -Wall -O3 -funroll-loops
+CFLAGS=??EXTRA_CFLAGS?? -I$(ZLIBINC) -Wall -O3 -funroll-loops
+LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz
+LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz
#RANLIB=echo
INCPATH=$(prefix)/include
RANLIB=ranlib
LIBPATH=$(exec_prefix)/lib
@@ -58,7 +58,7 @@
@@ -178,7 +178,7 @@
.c.pic.o:
$(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
-all: libpng.a $(LIBNAME).dylib pngtest libpng.pc libpng-config
+all: libpng.a pngtest libpng.pc libpng-config
libpng.a: $(OBJS)
ar rc $@ $(OBJS)
@@ -164,7 +164,7 @@
chmod 755 $(DB)/$(LIBNAME)-config
chmod 755 $(DB)/$(LIBNAME)-config
(cd $(DB);
ln -sf
$(LIBNAME)-config libpng-config)
(cd $(DB);
$(LN_SF)
$(LIBNAME)-config libpng-config)
-install: install-static install-shared install-man install-config
-install: install-static install-shared install-man install-config
+install: install-static install-man install-config
+install: install-static install-man install-config
...
...
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