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
debf910e
Commit
debf910e
authored
Apr 06, 2005
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Disable building of shared lib of libpng on OSX. it's broken
parent
acda4ecb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
4 deletions
+32
-4
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+1
-1
extras/contrib/src/Patches/libpng.patch
extras/contrib/src/Patches/libpng.patch
+31
-3
No files found.
extras/contrib/src/Makefile
View file @
debf910e
...
@@ -1023,7 +1023,7 @@ libpng: libpng-$(PNG_VERSION).tar.bz2
...
@@ -1023,7 +1023,7 @@ libpng: libpng-$(PNG_VERSION).tar.bz2
cat
Patches/libpng.patch |
sed
s,PREFIX,
$(PREFIX)
, | patch
-p0
cat
Patches/libpng.patch |
sed
s,PREFIX,
$(PREFIX)
, | patch
-p0
.png
:
libpng
.png
:
libpng
(
cd
$<
;
cp
scripts/makefile.macosx Makefile
&&
make
shared
&&
make
install
)
(
cd
$<
;
cp
scripts/makefile.macosx Makefile
&&
make
&&
make
install
)
touch
$@
touch
$@
CLEAN_FILE
+=
.png
CLEAN_FILE
+=
.png
...
...
extras/contrib/src/Patches/libpng.patch
View file @
debf910e
--- libpng/scripts/makefile.macosx Sun Sep 26 18:18:04 2004
diff -ruN libpng.orig/scripts/makefile.macosx libpng/scripts/makefile.macosx
+++ libpng/scripts/makefile.macosx.orig Thu Oct 3 13:32:34 2002
--- libpng.orig/scripts/makefile.macosx Thu Oct 3 13:32:34 2002
+++ libpng/scripts/makefile.macosx Thu Apr 7 01:00:51 2005
@@ -6,7 +6,7 @@
@@ -6,7 +6,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 and png.h
# where make install puts libpng.a and png.h
-prefix=/usr/local
-prefix=/usr/local
+prefix=PREFIX
+prefix=PREFIX
# Where the zlib library and include files are located
# Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib
#ZLIBLIB=/usr/local/lib
@@ -21,7 +21,7 @@
PNGVER = $(PNGMAJ).$(PNGMIN)
CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -current_version $(PNGVER)
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz
LIBNAME=libpng12
SHAREDLIB_POSTFIX=dylib
@@ -52,7 +52,7 @@
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
pngwtran.o pngmem.o pngerror.o pngpread.o
-all: libpng.a pngtest shared libpng.pc libpng-config
+all: libpng.a pngtest libpng.pc libpng-config
shared: $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX)
@@ -153,7 +153,7 @@
chmod 755 $(DB)/$(LIBNAME)-config
(cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
-install: install-static install-shared install-man install-config
+install: install-static install-man install-config
# If you installed in $(DESTDIR), test-installed won't work until you
# move the library to its final location.
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