Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
f30232e4
Commit
f30232e4
authored
Oct 13, 2008
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(win32 contrib) Build theora without docs on win32.
parent
7f6b4e76
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
60 additions
and
0 deletions
+60
-0
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+6
-0
extras/contrib/src/Patches/theora-doc.patch
extras/contrib/src/Patches/theora-doc.patch
+54
-0
No files found.
extras/contrib/src/Makefile
View file @
f30232e4
...
...
@@ -781,9 +781,15 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2
$(EXTRACT_BZ2)
patch
-p0
< Patches/theora.patch
patch
-p0
< Patches/libtheora-includes.patch
ifdef
HAVE_WIN32
patch
-p0
< Patches/theora-doc.patch
endif
(
cd
$@
;
autoconf
)
THEORACONF
=
--disable-sdltest
--disable-oggtest
--disable-vorbistest
--disable-examples
ifdef
HAVE_WIN32
THEORACONF
+=
--disable-docs
endif
.theora
:
libtheora .ogg
ifdef
HAVE_BEOS
...
...
extras/contrib/src/Patches/theora-doc.patch
0 → 100644
View file @
f30232e4
--- libtheora/configure.ac 2008-04-16 22:25:55.000000000 +0200
+++ libtheora.new/configure.ac 2008-10-07 10:06:22.000000000 +0200
@@ -351,6 +351,12 @@
AC_ARG_ENABLE(examples,
[ ac_enable_examples=$enableval ], [ ac_enable_examples=yes] )
AM_CONDITIONAL(THEORA_ENABLE_EXAMPLES, [test "x${ac_enable_examples}" != xno])
+ac_enable_docs=yes
+AC_ARG_ENABLE(docs,
+ [ --disable-docs disable docs ],
+ [ ac_enable_docs=$enableval ], [ac_enable_docs=yes ] )
+AM_CONDITIONAL(THEORA_ENABLE_DOCS, [test "x${ac_enable_docs}" != xno])
+
dnl --------------------------------------------------
dnl Check for headers
dnl --------------------------------------------------
@@ -410,7 +416,7 @@
AS_AC_EXPAND(INCLUDEDIR, ${includedir})
AS_AC_EXPAND(BINDIR, ${bindir})
AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
-if test $HAVE_DOXYGEN = "false"; then
+if test $HAVE_DOXYGEN = "false" -o "x${ac_enable_docs}" = xno; then
doc_build="no"
else
doc_build="yes"
--- libtheora/Makefile.am.orig 2008-10-07 10:01:12.000000000 +0200
+++ libtheora/Makefile.am 2008-10-07 10:00:36.000000000 +0200
@@ -8,7 +8,13 @@
else
EXAMPLES_DIR =
endif
-SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
+if THEORA_ENABLE_DOCS
+DOC_DIR = doc
+else
+DOC_DIR =
+endif
+
+SUBDIRS = lib include ${DOC_DIR} tests m4 $(EXAMPLES_DIR)
# we include the whole debian/ dir in EXTRA_DIST because there's a problem
--- libtheora/Makefile.in 2008-10-07 10:21:32.000000000 +0200
+++ libtheora.new/Makefile.in 2008-10-07 10:21:05.000000000 +0200
@@ -245,7 +245,9 @@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
@THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR =
@THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples
-SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
+@THEORA_ENABLE_DOCS_FALSE@DOC_DIR=
+@THEORA_ENABLE_DOCS_TRUE@DOC_DIR=doc
+SUBDIRS = lib include ${DOC_DIR} tests m4 $(EXAMPLES_DIR)
# we include the whole debian/ dir in EXTRA_DIST because there's a problem
#
with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
\ No newline at end of file
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