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
1801dbcc
Commit
1801dbcc
authored
Apr 30, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Zlib: update to 1.2.6
parent
0ea07fba
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
18 deletions
+6
-18
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-static.patch
contrib/src/zlib/zlib-static.patch
+0
-11
contrib/src/zlib/zlib-wince.patch
contrib/src/zlib/zlib-wince.patch
+4
-4
No files found.
contrib/src/zlib/SHA512SUMS
View file @
1801dbcc
83ce467787903b7e90ece203aaea0be42174b9cf4a9aa16fe3f72925a4993b549d50154dec4cc76b4cb1aa0b7b966118772aca3d73efa0601167256ff7ce7a12 zlib-1.2.5
.tar.gz
f812ab3049fc2920a8da4649f6e60340ac365d58a0e76ace5219426aeb0759c0a474cfb2b9902cd0471158fa32a4d2c35692309d266e66013444bdced8ed00d9 zlib-1.2.6
.tar.gz
contrib/src/zlib/rules.mak
View file @
1801dbcc
# ZLIB
ZLIB_VERSION
:=
1.2.
5
ZLIB_VERSION
:=
1.2.
6
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-static.patch
$(MOVE)
.zlib
:
zlib
...
...
contrib/src/zlib/zlib-static.patch
deleted
100644 → 0
View file @
0ea07fba
--- zlib/Makefile.in 2010-04-20 06:12:21.000000000 +0200
+++ zlib.new/Makefile.in 2010-06-08 14:02:43.000000000 +0200
@@ -168,7 +168,7 @@
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
cp $(STATICLIB) $(DESTDIR)$(libdir)
- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
+ cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) || true >/dev/null 2>&1
cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
contrib/src/zlib/zlib-wince.patch
View file @
1801dbcc
--- zlib
/zutil.h 2010-04-18 21:29:24.000000000 +02
00
+++ zlib
.new/zutil.h 2010-06-08 13:53:03.000000000
+0200
@@ -1
53,6 +153
,10 @@
--- zlib
-1.2.6/zutil.h.orig 2011-12-18 19:39:45.000000000 +01
00
+++ zlib
-1.2.6/zutil.h 2012-04-30 23:29:05.787740053
+0200
@@ -1
61,6 +161
,10 @@
# endif
#endif
...
...
@@ -8,6 +8,6 @@
+# define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
#if defined(__BORLANDC__)
#if defined(__BORLANDC__)
&& !defined(MSDOS)
#pragma warn -8004
#pragma warn -8008
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