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
b1e95f08
Commit
b1e95f08
authored
Sep 29, 2004
by
Benjamin Pracht
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds libpng to OSX contribs (for the logo filters)
parent
854dbb84
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
2 deletions
+33
-2
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+20
-1
extras/contrib/src/Patches/libpng.patch
extras/contrib/src/Patches/libpng.patch
+11
-0
extras/contrib/src/packages.mak
extras/contrib/src/packages.mak
+2
-1
No files found.
extras/contrib/src/Makefile
View file @
b1e95f08
...
...
@@ -55,7 +55,7 @@ all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora
\
.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp
\
.dvdcss .dvdread .dvdnav .dvbpsi .live .goom .caca .mod
\
.cddb .cdio .vcdimager
.cddb .cdio .vcdimager
.png
endif
ifeq
($(SYS),BEOS)
all
:
.perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi
\
...
...
@@ -950,6 +950,25 @@ CLEAN_FILE += .toolame
CLEAN_PKG
+=
toolame
DISTCLEAN_PKG
+=
toolame-
$(TOOLAME_VERSION)
.tar.bz2
# ***************************************************************************
# libpng
# ***************************************************************************
libpng-$(PNG_VERSION).tar.bz2
:
$(WGET)
$(PNG_URL)
libpng
:
libpng-$(PNG_VERSION).tar.bz2
$(EXTRACT_BZ2)
cat
Patches/libpng.patch |
sed
s,PREFIX,
$(PREFIX)
, | patch
-p0
.png
:
libpng
(
cd
$<
;
cp
scripts/makefile.macosx Makefile
&&
make shared
&&
make
install
)
touch
$@
CLEAN_FILE
+=
.png
CLEAN_PKG
+=
libpng
DISCLEAN_PKG
+=
libpng-
$(PNG_VERSION)
.tar.bz2
# ***************************************************************************
# Some cleansing
# ***************************************************************************
...
...
extras/contrib/src/Patches/libpng.patch
0 → 100644
View file @
b1e95f08
--- libpng/scripts/makefile.macosx Sun Sep 26 18:18:04 2004
+++ libpng/scripts/makefile.macosx.orig Thu Oct 3 13:32:34 2002
@@ -6,7 +6,7 @@
# For conditions of distribution and use, see copyright notice in png.h
# where make install puts libpng.a and png.h
-prefix=/usr/local
+prefix=PREFIX
# Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib
extras/contrib/src/packages.mak
View file @
b1e95f08
...
...
@@ -107,4 +107,5 @@ CDIO_VERSION=0.70
CDIO_URL
=
$(GNU)
/libcdio/libcdio-
$(CDIO_VERSION)
.tar.gz
TOOLAME_VERSION
=
02m-beta8
TOOLAME_URL
=
$(VIDEOLAN)
/testing/contrib/toolame-
$(TOOLAME_VERSION)
.tar.bz2
PNG_VERSION
=
1.2.5
PNG_URL
=
$(VIDEOLAN)
/testing/contrib/libpng-
$(PNG_VERSION)
.tar.bz2
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