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
1ffac5a9
Commit
1ffac5a9
authored
Aug 25, 2014
by
Felix Paul Kühne
Committed by
Adrien Maglo
Oct 01, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: add protobuf
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
ffff89e8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
62 additions
and
0 deletions
+62
-0
contrib/src/protobuf/SHA512SUMS
contrib/src/protobuf/SHA512SUMS
+1
-0
contrib/src/protobuf/rules.mak
contrib/src/protobuf/rules.mak
+33
-0
contrib/src/protobuf/win32.patch
contrib/src/protobuf/win32.patch
+28
-0
No files found.
contrib/src/protobuf/SHA512SUMS
0 → 100644
View file @
1ffac5a9
5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee protobuf-2.5.0.tar.bz2
contrib/src/protobuf/rules.mak
0 → 100644
View file @
1ffac5a9
# protobuf
PROTOBUF_VERSION
:=
2.5.0
PROTOBUF_URL
:=
https://protobuf.googlecode.com/files/protobuf-
$(PROTOBUF_VERSION)
.tar.bz2
PKGS
+=
protobuf
ifeq
($(call need_pkg,"protobuf"),)
PKGS_FOUND
+=
protobuf
endif
$(TARBALLS)/protobuf-$(PROTOBUF_VERSION).tar.bz2
:
$(
call
download,
$(PROTOBUF_URL)
)
.sum-protobuf
:
protobuf-$(PROTOBUF_VERSION).tar.bz2
DEPS_protobuf
=
zlib
$(DEPS_zlib)
protobuf
:
protobuf-$(PROTOBUF_VERSION).tar.bz2 .sum-protobuf
$(UNPACK)
ifdef
HAVE_WIN32
$(APPLY)
$(SRC)
/protobuf/win32.patch
endif
$(MOVE)
.protobuf
:
protobuf
$(RECONF)
# Local protoc Compiler
ifdef
HAVE_CROSS_COMPILE
cd
$<
&&
./configure
--prefix
=
"
$(PREFIX)
"
&&
$(MAKE)
install
cd
$<
&&
$(MAKE)
clean
endif
cd
$<
&&
$(HOSTVARS)
./configure
$(HOSTCONF)
--with-protoc
=
protoc
cd
$<
&&
$(MAKE)
install
touch
$@
contrib/src/protobuf/win32.patch
0 → 100644
View file @
1ffac5a9
diff -ruN protobuf/src/google/protobuf/stubs/common.h protobuf.new/src/google/protobuf/stubs/common.h
--- protobuf/src/google/protobuf/stubs/common.h 2013-02-26 18:56:38.000000000 +0100
+++ protobuf.new/src/google/protobuf/stubs/common.h 2014-08-13 21:27:13.620935659 +0200
@@ -619,6 +619,10 @@
// ===================================================================
// emulates google3/base/logging.h
+#if defined(ERROR)
+# undef ERROR
+#endif
+
enum LogLevel {
LOGLEVEL_INFO, // Informational. This is never actually used by
// libprotobuf.
diff -ruN protobuf/src/google/protobuf/extension_set.cc protobuf.new/src/google/protobuf/extension_set.cc
--- protobuf/src/google/protobuf/extension_set.cc 2013-02-26 18:56:42.000000000 +0100
+++ protobuf.new/src/google/protobuf/extension_set.cc 2014-08-13 21:23:50.960935943 +0200
@@ -218,6 +218,10 @@
// ===================================================================
// Field accessors
+#if defined(OPTIONAL)
+# undef OPTIONAL
+#endif
+
namespace {
enum Cardinality {
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