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
9eb524de
Commit
9eb524de
authored
Aug 08, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: update zlib to 1.2.7
parent
74b50fc6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
15 deletions
+2
-15
contrib/src/zlib/SHA512SUMS
contrib/src/zlib/SHA512SUMS
+1
-1
contrib/src/zlib/rules.mak
contrib/src/zlib/rules.mak
+1
-2
contrib/src/zlib/zlib-osx.patch
contrib/src/zlib/zlib-osx.patch
+0
-12
No files found.
contrib/src/zlib/SHA512SUMS
View file @
9eb524de
f812ab3049fc2920a8da4649f6e60340ac365d58a0e76ace5219426aeb0759c0a474cfb2b9902cd0471158fa32a4d2c35692309d266e66013444bdced8ed00d9 zlib-1.2.6
.tar.gz
b1c073ad26684e354f7c522c14655840592e03872bc0a94690f89cae2ff88f146fce1dad252ff27a889dac4a32ff9f8ab63ba940671f9da89e9ba3e19f1bf58d zlib-1.2.7
.tar.gz
contrib/src/zlib/rules.mak
View file @
9eb524de
# ZLIB
ZLIB_VERSION
:=
1.2.
6
ZLIB_VERSION
:=
1.2.
7
ZLIB_URL
:=
$(SF)
/libpng/zlib-
$(ZLIB_VERSION)
.tar.gz
PKGS
+=
zlib
...
...
@@ -15,7 +15,6 @@ $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
zlib
:
zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
$(UNPACK)
$(APPLY)
$(SRC)
/zlib/zlib-wince.patch
$(APPLY)
$(SRC)
/zlib/zlib-osx.patch
$(MOVE)
.zlib
:
zlib
...
...
contrib/src/zlib/zlib-osx.patch
deleted
100644 → 0
View file @
74b50fc6
diff -ru zlib.orig/configure zlib/configure
--- zlib.orig/configure 2012-04-30 23:41:03.155668067 -0400
+++ zlib/configure 2012-04-30 23:41:13.787667975 -0400
@@ -206,7 +206,7 @@
SHAREDLIBV=libz.$VER$shared_ext
SHAREDLIBM=libz.$VER1$shared_ext
LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
- AR="libtool"
+ AR="/usr/bin/libtool"
ARFLAGS="-o" ;;
*) LDSHARED=${LDSHARED-"$cc -shared"} ;;
esac
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