Permalink
Browse files

Updated binary versions and build scripts

1 parent 6f86208 commit 19a1c95fed4be411944c9f1d284c93a85e7b9d20 @Raptor399 Raptor399 committed Nov 17, 2013
@@ -10,38 +10,39 @@
#
VERSION_BZIP2=1.0.6
VERSION_DCRAW=9.07
-VERSION_ENCA=1.13
+VERSION_ENCA=1.15
VERSION_EXPAT=2.1.0
VERSION_FAAD2=2.7
VERSION_FLAC=1.2.1
VERSION_FONTCONFIG=2.10.1
-VERSION_FFMPEG=n0.11.1
-VERSION_FREETYPE=2.4.10
-VERSION_FRIBIDI=0.19.2
-VERSION_GIFLIB=4.1.6
-VERSION_HARFBUZZ=0.9.4
-VERSION_ICONV=1.13.1
-VERSION_JPEG=8d
+VERSION_FFMPEG=release/2.1
+VERSION_FREETYPE=2.5.0
+VERSION_FRIBIDI=0.19.5
+VERSION_GIFLIB=5.0.5
+VERSION_HARFBUZZ=0.9.23
+VERSION_ICONV=1.14
+VERSION_JPEG=9
VERSION_LAME=3.99.5
# Automatically checking out latest stable version
#VERSION_LIBASS=0.10.0
-VERSION_LIBBLURAY=0.2.2
+VERSION_LIBBLURAY=0.4.0
VERSION_LIBDCA=0.0.5
VERSION_LIBDV=1.0.0
VERSION_LIBMAD=0.15.1b
-VERSION_LIBMEDIAINFO=0.7.57
-VERSION_LIBPNG=1.5.12
-VERSION_LIBOGG=1.3.0
+VERSION_LIBMEDIAINFO=0.7.63
+VERSION_LIBPNG=1.6.6
+VERSION_LIBOGG=1.3.1
VERSION_LIBVORBIS=1.3.3
VERSION_LIBTHEORA=1.1.1
-VERSION_LIBZEN=0.4.26
+VERSION_LIBXML2=v2.9.1
+VERSION_LIBZEN=0.4.29
VERSION_LZO=2.06
-VERSION_MPLAYER=35003
+VERSION_MPLAYER=36502
VERSION_NCURSES=5.9
-VERSION_PS3MEDIASERVER=release-1.70.1
+VERSION_PS3MEDIASERVER=release-1.90.1
VERSION_TSMUXER=1.10.6
# Automatically checking out latest stable version
#VERSION_X264=r2200
VERSION_XVID=1.3.2
-VERSION_ZLIB=1.2.7
+VERSION_ZLIB=1.2.8
VERSION_YASM=1.2.0
@@ -523,11 +523,12 @@ initialize() {
set_flags() {
CFLAGS=""
CXXFLAGS=""
+ CPPFLAGS=""
LDFLAGS=""
if is_osx; then
# Minimum OSX version as target
- OSX_VERSION=10.7
+ OSX_VERSION=10.8
if [ -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs ]; then
# Xcode 4.3+
@@ -585,14 +586,16 @@ EOM
# Paths of the build environment
CFLAGS="$CFLAGS -I$TARGET/include"
CXXFLAGS="$CXXFLAGS -I$TARGET/include"
+ CPPFLAGS="$CPPFLAGS -I$TARGET/include"
if is_osx; then
LDFLAGS="$LDFLAGS -L$TARGET/lib -Wl,-search_paths_first"
else
LDFLAGS="$LDFLAGS -L$TARGET/lib -Wl,-rpath -Wl,$TARGET/lib"
fi
- export CFLAGS CXXFLAGS LDFLAGS
+ export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+ export LD_LIBRARY_PATH=$TARGET/lib
}
@@ -895,6 +898,12 @@ build_freetype() {
$MAKE -j$THREADS
exit_on_error
$MAKE install
+
+ if is_osx; then
+ # Avoid "ERROR: freetype2 not found" message when compiling ffmpeg
+ $SED -i -e "s/-lfreetype/-lfreetype -lpng16/" $TARGET/lib/pkgconfig/freetype2.pc
+ fi
+
cd $WORKDIR
}
@@ -908,7 +917,7 @@ build_fribidi() {
cd $BUILD
if [ ! -d fribidi-$VERSION_FRIBIDI ]; then
- $TAR zxf $SRC/fribidi-$VERSION_FRIBIDI.tar.gz
+ $TAR jxf $SRC/fribidi-$VERSION_FRIBIDI.tar.bz2
exit_on_error
fi
@@ -1300,6 +1309,27 @@ build_libtheora() {
##########################################
+# LIBXML2
+# http://xmlsoft.org/
+#
+build_libxml2() {
+ start_build libxml2
+ cd $BUILD
+
+ cp -a $SRC/libxml2 ./
+ exit_on_error
+ cd libxml2
+ exit_on_error
+
+ ./autogen.sh --disable-shared --disable-dependency-tracking --prefix=$TARGET
+ $MAKE -j$THREADS
+ exit_on_error
+ $MAKE install
+ cd $WORKDIR
+}
+
+
+##########################################
# LIBZEN
# http://sourceforge.net/projects/zenlib/
#
@@ -1714,29 +1744,31 @@ build_zlib
build_bzip2
build_expat
build_faad2
+build_libpng
build_freetype
build_iconv
# Note: fontconfig requires freetype and iconv to build
build_fontconfig
build_fribidi
build_enca
build_giflib
-# build_harfbuzz # we do not need harfbuzz right now (also build errors)
+# build_harfbuzz # We do not need harfbuzz right now (also build errors)
build_jpeg
-build_libpng
build_libass
-build_ncurses
+#build_ncurses # Build error!
+build_libxml2
+# Note: lame needs libxml2 to build
build_lame
build_libbluray
-build_libdca
+#build_libdca # Build error!
build_libdv
build_libmad
build_libzen
# Note: libmediainfo requires libzen to build
build_libmediainfo
build_libogg
build_libvorbis
-build_libtheora
+#build_libtheora # Build error!
build_lzo
build_x264
build_xvid
@@ -338,8 +338,8 @@ download_fribidi() {
start_download fribidi
cd $SRC
- if [ ! -f fribidi-${VERSION_FRIBIDI}.tar.gz ]; then
- download http://fribidi.org/download/fribidi-${VERSION_FRIBIDI}.tar.gz
+ if [ ! -f fribidi-${VERSION_FRIBIDI}.tar.bz2 ]; then
+ download http://fribidi.org/download/fribidi-${VERSION_FRIBIDI}.tar.bz2
exit_on_error
fi
}
@@ -354,7 +354,7 @@ download_giflib() {
cd $SRC
if [ ! -f giflib-${VERSION_GIFLIB}.tar.bz2 ]; then
- download http://downloads.sourceforge.net/project/giflib/giflib-4.x/giflib-${VERSION_GIFLIB}/giflib-${VERSION_GIFLIB}.tar.bz2
+ download http://downloads.sourceforge.net/project/giflib/giflib-5.x/giflib-${VERSION_GIFLIB}.tar.bz2
exit_on_error
fi
}
@@ -524,9 +524,7 @@ download_libpng() {
cd $SRC
if [ ! -f libpng-${VERSION_LIBPNG}.tar.gz ]; then
- # One of these two, depending on whether we use the latest release
- download http://downloads.sourceforge.net/project/libpng/libpng15/older-releases/${VERSION_LIBPNG}/libpng-${VERSION_LIBPNG}.tar.gz
- #download http://downloads.sourceforge.net/project/libpng/libpng15/${VERSION_LIBPNG}/libpng-${VERSION_LIBPNG}.tar.gz
+ download ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-${VERSION_LIBPNG}.tar.gz
exit_on_error
fi
}
@@ -576,6 +574,31 @@ download_libtheora() {
fi
}
+##########################################
+# LIBXML2
+# http://xmlsoft.org/
+#
+download_libxml2() {
+ start_download libxml2
+ cd $SRC
+
+ if [ -d libxml2 ]; then
+ rm -rf libxml2
+ fi
+
+ $GIT clone git://git.gnome.org/libxml2 libxml2
+ exit_on_error
+ cd libxml2
+
+ if [ "$FIXED_REVISIONS" == "yes" ]; then
+ $GIT checkout ${VERSION_LIBXML2}
+ exit_on_error
+ fi
+
+ rm -rf ./.git
+}
+
+
##########################################
# LIBZEN
@@ -831,6 +854,7 @@ download_libbluray
download_libdca
download_libdv
download_libmad
+download_libxml2
download_libzen
download_libmediainfo
download_libpng
@@ -453,7 +453,7 @@ SET(FFMPEG_CONFIGURE_COMMAND
EXTERNALPROJECT_ADD(
ffmpeg
DEPENDS ${FFMPEG_DEPENDENCIES}
- URL http://ffmpeg.org/releases/ffmpeg-2.0.tar.gz
+ URL http://ffmpeg.org/releases/ffmpeg-2.1.tar.gz
PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/vendor/ffmpeg-banner.patch
CONFIGURE_COMMAND ${FFMPEG_CONFIGURE_COMMAND}
BUILD_IN_SOURCE 1
@@ -90,4 +90,4 @@ The helper and this documentation are based on [sffmpeg](https://github.com/pyke
## Version <a name="Version"></a>
-PMS6
+PMS7
@@ -14,7 +14,7 @@
}
+#define FFMPEG_CONFIGURATION "http://git.io/ZHdseg"
-+#define PMS_FFMPEG_VERSION 6
++#define PMS_FFMPEG_VERSION 7
static void print_program_info(int flags, int level)
{
const char *indent = flags & INDENT? " " : "";

0 comments on commit 19a1c95

Please sign in to comment.