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
3b82206f
Commit
3b82206f
authored
Mar 03, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: update libvorbis to 1.3.5
And drop all our patches :)
parent
6873c241
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
30 deletions
+2
-30
contrib/src/vorbis/SHA512SUMS
contrib/src/vorbis/SHA512SUMS
+1
-1
contrib/src/vorbis/msvc.patch
contrib/src/vorbis/msvc.patch
+0
-11
contrib/src/vorbis/osx.patch
contrib/src/vorbis/osx.patch
+0
-13
contrib/src/vorbis/rules.mak
contrib/src/vorbis/rules.mak
+1
-5
No files found.
contrib/src/vorbis/SHA512SUMS
View file @
3b82206f
f
705c7740bec2dc6584ab8f103491a9d462136e3fa76454bde47e2ba04466b896ef066f7f925ad0a44d4c659c962717bc9099b3cecc20f12270d0ad53369ad53 libvorbis-1.3.4
.tar.xz
f
18f32edc43f65fea2dd4133e2828a0ced9e5b0797c4569bd26989fc1409ad599359e7c796bffc082ad36189f9722c7b38837384cea66d217beac8b425299ef8 libvorbis-1.3.5
.tar.xz
contrib/src/vorbis/msvc.patch
deleted
100644 → 0
View file @
6873c241
--- libvorbis/lib/os.h 2014-01-22 10:53:32.000000000 +0100
+++ /home/vlc/vlc/contrib/windowsphone/libvorbis/lib/os.h 2014-12-15 16:54:46.588645600 +0100
@@ -120,7 +120,7 @@
/* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the
* 64 bit compiler */
-#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE)
+#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE) && !defined(_M_ARM)
# define VORBIS_FPU_CONTROL
typedef ogg_int16_t vorbis_fpu_control;
contrib/src/vorbis/osx.patch
deleted
100644 → 0
View file @
6873c241
--- libvorbis/configure.ac.orig 2012-09-07 00:17:47.000000000 +0200
+++ libvorbis/configure.ac 2012-09-07 00:18:01.000000000 +0200
@@ -199,8 +199,8 @@
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
*-*-darwin*)
DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
- CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
- PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
+ CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
+ PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
*-*-os2*)
# Use -W instead of -Wextra because gcc on OS/2 is an old version.
DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
contrib/src/vorbis/rules.mak
View file @
3b82206f
# libvorbis
VORBIS_VERSION
:=
1.3.
4
VORBIS_VERSION
:=
1.3.
5
VORBIS_URL
:=
http://downloads.xiph.org/releases/vorbis/libvorbis-
$(VORBIS_VERSION)
.tar.xz
#VORBIS_URL := $(CONTRIB_VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz
...
...
@@ -25,10 +25,6 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
libvorbis
:
libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
$(UNPACK)
$(APPLY)
$(SRC)
/vorbis/osx.patch
ifdef
HAVE_VISUALSTUDIO
$(APPLY)
$(SRC)
/vorbis/msvc.patch
endif
$(UPDATE_AUTOCONFIG)
$(MOVE)
...
...
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