Permalink
Browse files

ffmpeg build: update XAVS repo URL (same revision)

fix typos
  • Loading branch information...
1 parent 4ee0bcc commit 100a3a8f6ab544236f3d293838f599e894443218 @chocolateboy chocolateboy committed Aug 20, 2013
Showing with 11 additions and 12 deletions.
  1. +2 −2 BUILD.md
  2. +3 −4 CHANGELOG.txt
  3. +1 −1 DEVELOP.md
  4. +3 −3 contrib/ffmpeg/CMakeLists.txt
  5. +2 −2 pom.xml
View
@@ -254,9 +254,9 @@ The Windows installer can now be built with one of the following commands:
mvn package -P linux,-osx
-## Building the Mac OSX installer tarball
+## Building the Mac OS X installer tarball
-The Mac OSX installer tarball can be built on any platform by specifying
+The Mac OS X installer tarball can be built on any platform by specifying
the "osx" profile explicity:
mvn package -P osx
View
@@ -3,19 +3,18 @@ Changelog:
1.90.2 - 2013-??-??
-
1.90.1 - 2013-08-17
Engines:
- FFmpeg Video, FFMpeg Web Video and FFmpeg Web Audio:
- Fix issue that prevented plugins extending FFmpegWebAudio and FFmpegWebVideo safely
- Updated FFmpeg for Windows
- MEncoder Video:
- - Fix for spaces in font names breaking playback
+ - Fix for spaces in font names breaking playback
Misc:
- - Fixed regression with tsMuxer and H264 support
- - Restored Java support for file names with special characters on Mac OS X.
+ - Fixed regression with tsMuxeR and H.264 support
+ - Restored Java support for file names with special characters on Mac OS X
1.90.0 - 2013-07-31
View
@@ -119,4 +119,4 @@ Thanks to the following developers and companies for providing tools used in PMS
* [DocToc](https://github.com/thlorenz/doctoc) - a tool used to generate TOCs for some of our Markdown documents
* ej-technologies for [JProfiler](http://www.ej-technologies.com/products/jprofiler/overview.html) - Java Profiler [Open Source License](http://www.ej-technologies.com/buy/jprofiler/openSource/enter)
* JetBrains for [IntelliJ IDEA](https://www.jetbrains.com/idea/) - Java IDE [Open Source Project Development License](https://www.jetbrains.com/idea/opensource/license.html)
-* [IzPack](http://izpack.org/) - used to package the Mac OSX application
+* [IzPack](http://izpack.org/) - used to package the Mac OS X application
@@ -117,7 +117,7 @@ EXTERNALPROJECT_ADD(
# (the 2.12.x series is still being maintained/updated: http://www.gnutls.org/security.html)
# http://public.kitware.com/Bug/view.php?id=13515
URL ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/gnutls-2.12.23.tar.bz2
- # XXX linking against nettle breaks with "duplicate symbol _memxor" on Mac OSX
+ # XXX linking against nettle breaks with "duplicate symbol _memxor" on Mac OS X
PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/vendor/gnutls-memxor.patch
# XXX linking against nettle/hogweed breaks unless -lgmp is added
# XXX and it can't find the lib dir from --prefix, so that needs to be added as well
@@ -190,7 +190,7 @@ EXTERNALPROJECT_ADD(
)
IF (APPLE)
- # Mac OSX build needs to force the correct architecture.
+ # Mac OS X build needs to force the correct architecture.
SET(CONFIGURE_COMMAND_OPENSSL ./configure darwin64-x86_64-cc no-shared no-idea no-mdc2 no-rc5 --prefix=${CMAKE_BINARY_DIR})
SET(BUILD_COMMAND_OPENSSL make depend MAKEDEPPROG=${CMAKE_C_COMPILER} && make)
ELSE()
@@ -315,7 +315,7 @@ ENDIF()
EXTERNALPROJECT_ADD(
xavs
- SVN_REPOSITORY https://xavs.svn.sourceforge.net/svnroot/xavs/trunk/
+ SVN_REPOSITORY https://svn.code.sf.net/p/xavs/code/trunk
SVN_REVISION -r55 # 2011-08-21
# Avoid "Server certificate verification failed: issuer is not trusted" error
SVN_TRUST_CERT 1
View
@@ -1434,7 +1434,7 @@
</profile>
<!--
- Mac OSX profile: takes care of building the final package for Mac OS X.
+ Mac OS X profile: takes care of building the final package for Mac OS X.
-->
<profile>
<id>osx</id>
@@ -1455,7 +1455,7 @@
<build>
<resources>
- <!-- Copy precompiled OSX binaries. -->
+ <!-- Copy precompiled OS X binaries. -->
<resource>
<directory>${external-resources.transcode-tools.directory}/osx/bin</directory>
<targetPath>${izpack.staging}/osx</targetPath>

0 comments on commit 100a3a8

Please sign in to comment.