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
bb286ca8
Commit
bb286ca8
authored
Jan 06, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: update libebml 1.3.1
Move to autoconf
parent
c25d1cef
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
44 deletions
+4
-44
contrib/src/ebml/SHA512SUMS
contrib/src/ebml/SHA512SUMS
+1
-1
contrib/src/ebml/ebml-pic.patch
contrib/src/ebml/ebml-pic.patch
+0
-22
contrib/src/ebml/no-ansi.patch
contrib/src/ebml/no-ansi.patch
+0
-11
contrib/src/ebml/rules.mak
contrib/src/ebml/rules.mak
+3
-10
No files found.
contrib/src/ebml/SHA512SUMS
View file @
bb286ca8
f5687af60e94f167cd341c24f038d57735d447b6279e96b916e3b0a98ca141f3c241ef4c46dd55ac87b0f6007eb14835e0f2a602f89610fcc0b4f93e8b9c87ab libebml-1.3.0
.tar.bz2
b42d198611e480a4938fe95b920f6ee6ca37453f9551990e4310ed82651f93284f1de1d871357b6280219634bbbf6a98d4ac988e25e7bd7b5bbf5c0ba5766334 libebml-1.3.1
.tar.bz2
contrib/src/ebml/ebml-pic.patch
deleted
100644 → 0
View file @
c25d1cef
diff -ru libebml.orig/make/linux/Makefile libebml/make/linux/Makefile
--- libebml.orig/make/linux/Makefile 2011-08-03 13:39:21.000000000 +0300
+++ libebml/make/linux/Makefile 2011-08-03 13:39:57.000000000 +0300
@@ -59,7 +59,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 -Wshadow
COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
@@ -81,9 +81,6 @@
# Build rules
%.o: %$(EXTENSION)
- $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-
-%.lo: %$(EXTENSION)
$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
$(LIBRARY): $(objects)
contrib/src/ebml/no-ansi.patch
deleted
100644 → 0
View file @
c25d1cef
--- libebml-1.3.0/make/linux/Makefile.orig 2013-07-04 19:08:40.474927603 +0200
+++ libebml-1.3.0/make/linux/Makefile 2013-07-04 19:09:09.568664476 +0200
@@ -61,7 +61,7 @@
objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
objects_so:=$(objects)
-WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
+WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -fno-gnu-keywords -Wshadow
COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)
contrib/src/ebml/rules.mak
View file @
bb286ca8
# ebml
# ebml
EBML_VERSION
:=
1.3.
0
EBML_VERSION
:=
1.3.
1
EBML_URL
:=
http://dl.matroska.org/downloads/libebml/libebml-
$(EBML_VERSION)
.tar.bz2
EBML_URL
:=
http://dl.matroska.org/downloads/libebml/libebml-
$(EBML_VERSION)
.tar.bz2
#EBML_URL := $(CONTRIB_VIDEOLAN)/libebml-$(EBML_VERSION).tar.bz2
#EBML_URL := $(CONTRIB_VIDEOLAN)/libebml-$(EBML_VERSION).tar.bz2
...
@@ -11,8 +11,6 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2:
...
@@ -11,8 +11,6 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2:
libebml
:
libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
libebml
:
libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
$(UNPACK)
$(UNPACK)
$(APPLY)
$(SRC)
/ebml/ebml-pic.patch
$(APPLY)
$(SRC)
/ebml/no-ansi.patch
$(MOVE)
$(MOVE)
# libebml requires exceptions
# libebml requires exceptions
...
@@ -20,11 +18,6 @@ EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" \
...
@@ -20,11 +18,6 @@ EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" \
CPPFLAGS
=
""
CPPFLAGS
=
""
.ebml
:
libebml
.ebml
:
libebml
ifdef
HAVE_WIN32
cd
$<
&&
$(HOSTVARS)
./configure
$(HOSTCONF)
cd
$<
&&
$(MAKE)
-C
make/mingw32
prefix
=
"
$(PREFIX)
"
$(HOSTVARS)
SHARED
=
no
cd
$<
&&
$(MAKE)
install
else
cd
$<
&&
$(MAKE)
-C
make/linux
prefix
=
"
$(PREFIX)
"
$(HOSTVARS)
$(EBML_EXTRA_FLAGS)
staticlib
endif
cd
$<
&&
$(MAKE)
-C
make/linux install_staticlib install_headers
prefix
=
"
$(PREFIX)
"
$(HOSTVARS)
$(RANLIB)
"
$(PREFIX)
/lib/libebml.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