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
03cd31d2
Commit
03cd31d2
authored
Jan 06, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: update libmatroska to 1.4.2
Move to autotools
parent
bb286ca8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
32 deletions
+4
-32
contrib/src/matroska/SHA512SUMS
contrib/src/matroska/SHA512SUMS
+1
-1
contrib/src/matroska/matroska-pic.patch
contrib/src/matroska/matroska-pic.patch
+0
-22
contrib/src/matroska/rules.mak
contrib/src/matroska/rules.mak
+3
-9
No files found.
contrib/src/matroska/SHA512SUMS
View file @
03cd31d2
06db4906f497cca4adc09b8e8588edddc840cca1fbbf9890491cbfa55f9f238ad7d8b86de687293a5caa15dbc2ae64ac8fcb05da062940017f346be46e9ba8e3 libmatroska-1.4.1
.tar.bz2
37b7e35c4db0a5265682f69e2ded251168f64499ab86fa228d9a4dde8a85edab7b8b60c722563c1fed27317cd0e94ee86322c18446430aae7cafeda20a90e549 libmatroska-1.4.2
.tar.bz2
contrib/src/matroska/matroska-pic.patch
deleted
100644 → 0
View file @
bb286ca8
diff -ru libmatroska.orig/make/linux/Makefile libmatroska/make/linux/Makefile
--- libmatroska.orig/make/linux/Makefile 2011-06-15 15:00:37.000000000 +0300
+++ libmatroska/make/linux/Makefile 2011-08-03 13:33:25.000000000 +0300
@@ -65,7 +65,7 @@
# object files; replace .cxx extension with .o
objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
+objects_so:=$(objects)
WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
-Wshadow
@@ -89,9 +89,6 @@
# Build rules
%.o: %$(EXTENSION)
- $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-
-%.lo: %$(EXTENSION)
$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
$(LIBRARY): $(objects)
contrib/src/matroska/rules.mak
View file @
03cd31d2
# matroska
# matroska
MATROSKA_VERSION
:=
1.4.
1
MATROSKA_VERSION
:=
1.4.
2
MATROSKA_URL
:=
http://dl.matroska.org/downloads/libmatroska/libmatroska-
$(MATROSKA_VERSION)
.tar.bz2
MATROSKA_URL
:=
http://dl.matroska.org/downloads/libmatroska/libmatroska-
$(MATROSKA_VERSION)
.tar.bz2
#MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2
#MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2
...
@@ -14,15 +14,9 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
...
@@ -14,15 +14,9 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
libmatroska
:
libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
libmatroska
:
libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
$(UNPACK)
$(UNPACK)
$(APPLY)
$(SRC)
/matroska/matroska-pic.patch
$(MOVE)
$(MOVE)
.matroska
:
libmatroska
.matroska
:
libmatroska
ifdef
HAVE_WIN32
cd
$<
&&
$(HOSTVARS)
./configure
$(HOSTCONF)
cd
$<
&&
$(MAKE)
-C
make/mingw32
prefix
=
"
$(PREFIX)
"
$(HOSTVARS)
SHARED
=
no
EBML_DLL
=
no libmatroska.a
cd
$<
&&
$(MAKE)
install
else
cd
$<
&&
$(MAKE)
-C
make/linux
prefix
=
"
$(PREFIX)
"
$(HOSTVARS)
staticlib
endif
cd
$<
&&
$(MAKE)
-C
make/linux install_staticlib install_headers
prefix
=
"
$(PREFIX)
"
$(HOSTVARS)
$(RANLIB)
"
$(PREFIX)
/lib/libmatroska.a"
touch
$@
touch
$@
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