mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-03 05:28:53 +02:00
Merge branch 'package-management'
Conflicts: app-arch/p7zip/p7zip-9.04.bep app-arch/p7zip/p7zip-9.13.bep app-arch/tar/tar-1.22.bep app-arch/tar/tar-1.23.bep app-arch/tar/tar-1.25.bep app-arch/xz-utils/xz-utils-4.999.9.bep app-cdr/bchunk/bchunk-1.2.0.bep app-cdr/cdrtools/cdrtools-2.01.01a66.bep app-cdr/cdrtools/cdrtools-3.01a01.bep app-crypt/gnupg/gnupg-1.4.11.bep app-doc/doxygen/doxygen-1.6.3.bep app-editors/nano/nano-2.2.6.bep app-editors/vim/vim-7.3.bep app-text/antiword/antiword-0.37.bep app-text/libpaper/libpaper-1.1.23.bep app-text/libpaper/libpaper-1.1.24.bep app-text/rman/rman-3.2.bep dev-db/sqlite/sqlite-3.6.22.bep dev-db/sqlite/sqlite-3.6.23.bep dev-db/sqlite/sqlite-3.7.2.bep dev-db/sqlite/sqlite-3.7.3.bep dev-db/sqlite/sqlite-3.7.4.bep dev-db/sqlite/sqlite-3.7.5.bep dev-lang/lua/lua-5.1.4.bep dev-lang/nasm/nasm-2.08.01.bep dev-lang/perl/patches/perl-5.10.0.patch dev-lang/python/python-2.5.4.bep dev-lang/python/python-2.6.4.bep dev-lang/python/python-2.6.5.bep dev-lang/python/python-2.6.6.bep dev-lang/python/python-2.6.7.bep dev-lang/python/python-2.6.8.bep dev-lang/python/python-3.2.bep dev-lang/python/python-3.2.recipe dev-lang/python/python-3.2a4.bep dev-lang/yasm/yasm-1.1.0.bep dev-libs/apr-util/apr-util-1.3.10.bep dev-libs/apr-util/apr-util-1.3.9.bep dev-libs/apr/apr-1.3.8.bep dev-libs/apr/apr-1.3.9.bep dev-libs/apr/apr-1.4.2.bep dev-libs/apr/patches/apr-1.4.2.patch dev-libs/expat/expat-2.0.1.bep dev-libs/fribidi/fribidi-0.19.2.bep dev-libs/icu/icu-4.4.1.bep dev-libs/libedit/libedit-20090923.bep dev-libs/libedit/libedit-20100424.bep dev-libs/libevent/libevent-1.4.11.bep dev-libs/libevent/libevent-1.4.13.bep dev-libs/libevent/libevent-1.4.14b.bep dev-libs/libevent/libevent-2.0.10.bep dev-libs/libiconv/libiconv-1.12.bep dev-libs/libiconv/libiconv-1.13.1.bep dev-libs/libpcre/libpcre-8.00.bep dev-libs/libpcre/libpcre-8.02.bep dev-libs/libpcre/libpcre-8.12.bep dev-libs/libxml2/libxml2-2.7.3.bep dev-libs/libxml2/libxml2-2.7.6.bep dev-libs/libxml2/libxml2-2.7.7.bep dev-libs/libxml2/libxml2-2.7.8.bep dev-libs/openssl/openssl-0.9.8l.bep dev-libs/openssl/openssl-0.9.8m.bep dev-libs/openssl/openssl-1.0.0.bep dev-libs/openssl/openssl-1.0.0a.bep dev-libs/openssl/openssl-1.0.0c.bep dev-qt/qtcore/qtcore-4.8.x-git.bep dev-qt/qtcore/qtcore-4.8.x.recipe dev-util/ccache/ccache-3.0.1.bep dev-util/cmake/cmake-2.6.4.bep dev-util/cmake/cmake-2.8.0.bep dev-util/cmake/cmake-2.8.1.bep dev-util/cmake/cmake-2.8.2.bep dev-util/cmake/cmake-2.8.3.bep dev-util/cmake/cmake-2.8.4.bep dev-util/ctags/ctags-5.8.bep dev-util/fastdep/fastdep-0.16.bep dev-util/gperf/gperf-3.0.4.bep dev-util/pkgconfig/pkgconfig-0.23.bep dev-util/pkgconfig/pkgconfig-0.25.bep dev-vcs/cvs/cvs-1.12.13.1.bep dev-vcs/cvs/cvs-1.12.13.bep dev-vcs/subversion/subversion-1.6.11.bep dev-vcs/subversion/subversion-1.6.12.bep dev-vcs/subversion/subversion-1.6.13.bep dev-vcs/subversion/subversion-1.6.15.bep dev-vcs/subversion/subversion-1.6.6.bep dev-vcs/subversion/subversion-1.6.9.bep dev-vcs/subversion/subversion-1.7.xx-svn.bep haiku-apps/bepdf/bepdf-1.1.1b4.bep haiku-apps/libwalter/libwalter-97.bep haiku-apps/paladin/paladin-1.3-hg.bep haiku-apps/pe/pe-2.4.3-600.bep haiku-apps/vision/patches/vision-908-gcc4.patch haiku-apps/vision/vision-0.9.7.bep haiku-libs/libwalter/libwalter-97.bep haiku-libs/libwalter/libwalter-97.recipe media-gfx/graphviz/graphviz-2.24.bep media-gfx/graphviz/graphviz-2.26.3.bep media-libs/flac/flac-1.2.1.bep media-libs/freetype/freetype-2.3.11.bep media-libs/freetype/freetype-2.4.2.bep media-libs/freetype/freetype-2.4.4.bep media-libs/ftgl/ftgl-2.1-svn.bep media-libs/guilib/guilib-1.2.1.bep media-libs/jpeg/jpeg-7.bep media-libs/jpeg/jpeg-8b.bep media-libs/jpeg/jpeg-8c.bep media-libs/libao/libao-1.0.0.bep media-libs/libmad/libmad-0.15.1b.bep media-libs/libmng/libmng-1.0.10.bep media-libs/libogg/libogg-1.1.4.bep media-libs/libogg/libogg-1.2.0.bep media-libs/libogg/libogg-1.2.2.bep media-libs/libpng/libpng-1.2.29.bep media-libs/libpng/libpng-1.2.30.bep media-libs/libpng/libpng-1.2.40.bep media-libs/libpng/libpng-1.2.41.bep media-libs/libpng/libpng-1.2.43.bep media-libs/libpng/libpng-1.2.44.bep media-libs/libpng/libpng-1.4.1.bep media-libs/libpng/libpng-1.4.2.bep media-libs/libpng/libpng-1.4.3.bep media-libs/libpng/libpng-1.4.4.bep media-libs/libpng/libpng-1.5.0.bep media-libs/libsdl/patches/libsdl-1.2-hg.patch media-libs/libtheora/libtheora-1.1.1.bep media-libs/libvorbis/libvorbis-1.2.3.bep media-libs/libvorbis/libvorbis-1.3.1.bep media-libs/libvorbis/libvorbis-1.3.2.bep media-libs/libvpx/libvpx-0.9.2-git.bep media-libs/smpeg/smpeg-0.4.5.bep media-libs/speex/speex-1.2-git.bep media-libs/speex/speex-1.2rc1.bep media-sound/lame/lame-3.98.4.bep media-sound/lame/lame-398-2.bep media-sound/vorbis-tools/vorbis-tools-1.2.0.bep media-sound/vorbis-tools/vorbis-tools-1.4.0.bep media-video/ffmpeg/ffmpeg-0.5.bep media-video/ffmpeg/ffmpeg-0.6.bep net-misc/curl/curl-7.18.2.bep net-misc/curl/curl-7.19.1.bep net-misc/curl/curl-7.19.2.bep net-misc/curl/curl-7.19.5.bep net-misc/curl/curl-7.19.7.bep net-misc/curl/curl-7.20.0.bep net-misc/curl/curl-7.20.1.bep net-misc/curl/curl-7.21.1.bep net-misc/curl/curl-7.21.2.bep net-misc/curl/curl-7.21.3.bep net-misc/openssh/openssh-5.4p1.bep net-misc/openssh/openssh-5.5p1.bep net-misc/openssh/openssh-5.6p1.bep net-misc/openssh/openssh-5.7p1.bep net-misc/openssh/openssh-5.8p1.bep net-wireless/b43-fwcutter/b43-fwcutter-012.bep sci-libs/gsl/gsl-1.14.bep sys-apps/ed/ed-1.4.bep sys-apps/gawk/gawk-3.1.8.bep sys-apps/grep/grep-2.5.4.bep sys-apps/grep/grep-2.7.bep sys-apps/groff/groff-1.20.1.bep sys-apps/man/man-1.6f.bep sys-apps/sed/sed-4.2.1.bep sys-apps/texinfo/texinfo-4.13a.bep sys-devel/autoconf/autoconf-2.68.bep sys-devel/automake/automake-1.11.1.bep sys-devel/bison/bison-2.4.1.bep sys-devel/bison/bison-2.4.bep sys-devel/flex/flex-2.5.35.bep sys-devel/gettext/gettext-0.18.1.1-dev.bep sys-devel/gettext/gettext-0.18.1.1.bep sys-devel/jam/jam-2.5.bep sys-devel/m4/m4-1.4.14.bep sys-libs/ncurses/ncurses-5.6.bep sys-libs/ncurses/ncurses-5.7.bep sys-libs/readline/readline-5.2.bep sys-libs/readline/readline-6.0.bep sys-libs/readline/readline-6.1.bep sys-libs/zlib/zlib-1.2.3.bep sys-libs/zlib/zlib-1.2.5.bep x11-libs/qt/qt-4.8.x-git.bep
This commit is contained in:
Oliver Tappe
@@ -1,27 +0,0 @@
|
||||
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library."
|
||||
HOMEPAGE="http://www.ffmpeg.org"
|
||||
SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2"
|
||||
CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="media-libs/libogg >= 1.3.0
|
||||
media-libs/speex >= 1.2rc1
|
||||
media-libs/libtheora >= 1.1.0
|
||||
media-libs/libvorbis >= 1.3.2
|
||||
media-libs/libvpx >= 1.0.0"
|
||||
BUILD {
|
||||
cd ffmpeg-0.10.2
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
|
||||
--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \
|
||||
--enable-gpl --datadir=`finddir B_COMMON_DATA_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd ffmpeg-0.10.2
|
||||
make install
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2000-2003 Fabrice Bellard
|
||||
2003-2012 the FFmpeg developers"
|
||||
@@ -1,28 +0,0 @@
|
||||
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library."
|
||||
HOMEPAGE="http://www.ffmpeg.org"
|
||||
SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2"
|
||||
CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="media-libs/libogg >= 1.3.0
|
||||
media-libs/speex >= 1.2rc1
|
||||
media-libs/libtheora >= 1.1.0
|
||||
media-libs/libvorbis >= 1.3.2
|
||||
media-libs/libvpx >= 1.0.0"
|
||||
BUILD {
|
||||
cd ffmpeg-0.10.2
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
|
||||
--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \
|
||||
--datadir=`finddir B_COMMON_DATA_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd ffmpeg-0.10.2
|
||||
make install
|
||||
}
|
||||
|
||||
LICENSE="GNU LGPL v2.1
|
||||
GNU GPL v2"
|
||||
COPYRIGHT="2000-2003 Fabrice Bellard
|
||||
2003-2012 the FFmpeg developers"
|
||||
154
media-video/ffmpeg/ffmpeg-0.10.2.recipe
Normal file
154
media-video/ffmpeg/ffmpeg-0.10.2.recipe
Normal file
@@ -0,0 +1,154 @@
|
||||
SUMMARY="Audio and video recording, conversion, and streaming library"
|
||||
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library."
|
||||
HOMEPAGE="http://www.ffmpeg.org"
|
||||
LICENSE="
|
||||
GNU LGPL v2.1
|
||||
GNU GPL v2
|
||||
"
|
||||
COPYRIGHT="
|
||||
2000-2003 Fabrice Bellard
|
||||
2003-2012 the FFmpeg developers
|
||||
"
|
||||
SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2"
|
||||
CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd"
|
||||
REVISION="4"
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
|
||||
PATCHES="ffmpeg-0.10.2-gcc2.patch"
|
||||
|
||||
PROVIDES="
|
||||
ffmpeg$secondaryArchSuffix = $portVersion compat >= 0.10
|
||||
lib:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53
|
||||
lib:libavdevice$secondaryArchSuffix = 53.4.100 compat >= 53
|
||||
lib:libavfilter$secondaryArchSuffix = 2.61.100 compat >= 2
|
||||
lib:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53
|
||||
lib:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51
|
||||
lib:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0
|
||||
lib:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2
|
||||
"
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
PROVIDES="$PROVIDES
|
||||
cmd:ffmpeg = $portVersion compat >= 0.10
|
||||
cmd:ffprobe = $portVersion compat >= 0.10
|
||||
cmd:ffserver = $portVersion compat >= 0.10
|
||||
"
|
||||
fi
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix >= $haikuVersion
|
||||
lib:libogg$secondaryArchSuffix
|
||||
lib:libspeex$secondaryArchSuffix
|
||||
lib:libtheoradec$secondaryArchSuffix
|
||||
lib:libtheoraenc$secondaryArchSuffix
|
||||
lib:libvorbis$secondaryArchSuffix
|
||||
lib:libvorbisenc$secondaryArchSuffix
|
||||
lib:libvpx$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
devel:libogg$secondaryArchSuffix
|
||||
devel:libspeex$secondaryArchSuffix
|
||||
devel:libtheora$secondaryArchSuffix
|
||||
devel:libvorbis$secondaryArchSuffix
|
||||
devel:libvpx$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel >= $haikuVersion
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:perl
|
||||
cmd:pkg_config
|
||||
cmd:texi2html
|
||||
cmd:yasm
|
||||
"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="
|
||||
settings/ffserver.conf
|
||||
"
|
||||
|
||||
PATCH()
|
||||
{
|
||||
# patch hard-coded config file path
|
||||
sed -i "s,/etc/ffserver.conf,$sysconfDir/ffserver.conf," \
|
||||
ffserver.c \
|
||||
doc/ffserver.texi
|
||||
|
||||
# patch hard-coded paths to perl
|
||||
sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd~perl/bin/perl," \
|
||||
Doxyfile \
|
||||
doc/texi2pod.pl
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
# not an auto tools configure
|
||||
./configure \
|
||||
--prefix=$prefix \
|
||||
--bindir=$binDir \
|
||||
--datadir=$dataDir/$portName \
|
||||
--incdir=$includeDir \
|
||||
--libdir=$libDir \
|
||||
--shlibdir=$libDir \
|
||||
--mandir=$manDir \
|
||||
--disable-debug \
|
||||
--enable-shared \
|
||||
--enable-libvorbis \
|
||||
--enable-libspeex \
|
||||
--enable-libtheora \
|
||||
--enable-libvpx
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm $binDir/ffprobe
|
||||
# TODO: Determine and fix what is wrong with ffprobe! The executable
|
||||
# seems to be broken. The NEEDED entries in the dynamic section look
|
||||
# weird and the runtime loader fails relocating with "Operation not
|
||||
# allowed".
|
||||
|
||||
prepareInstalledDevelLibs \
|
||||
libavcodec \
|
||||
libavdevice \
|
||||
libavfilter \
|
||||
libavformat \
|
||||
libavutil \
|
||||
libswresample \
|
||||
libswscale
|
||||
fixPkgconfig
|
||||
|
||||
# include the documented ffserver.conf
|
||||
mkdir -p $docDir
|
||||
cp doc/ffserver.conf $docDir
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
|
||||
# Remove stuff we don't need in the secondary architecture base package.
|
||||
if [ -n "$secondaryArchSuffix" ]; then
|
||||
rm -rf $prefix/bin
|
||||
rm -rf $documentationDir
|
||||
fi
|
||||
}
|
||||
|
||||
# ----- devel package -------------------------------------------------------
|
||||
|
||||
PROVIDES_devel="
|
||||
ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 0.10
|
||||
devel:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53
|
||||
devel:libavdevice$secondaryArchSuffix = 53.4.100 compat >= 53
|
||||
devel:libavfilter$secondaryArchSuffix = 2.61.100 compat >= 2
|
||||
devel:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53
|
||||
devel:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51
|
||||
devel:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0
|
||||
devel:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2
|
||||
"
|
||||
REQUIRES_devel="
|
||||
ffmpeg$secondaryArchSuffix == $portVersion
|
||||
"
|
||||
@@ -1,27 +0,0 @@
|
||||
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library."
|
||||
HOMEPAGE="http://www.ffmpeg.org"
|
||||
SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.tar.bz2"
|
||||
CHECKSUM_MD5="dc665cc599a739e3c5262ccdac13d129"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="media-libs/libogg >= 1.3.0
|
||||
media-libs/speex >= 1.2rc1
|
||||
media-libs/libtheora >= 1.1.0
|
||||
media-libs/libvorbis >= 1.3.2
|
||||
media-libs/libvpx >= 1.0.0"
|
||||
BUILD {
|
||||
cd ffmpeg-0.10
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
|
||||
--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd ffmpeg-0.10
|
||||
make install
|
||||
}
|
||||
|
||||
LICENSE="GNU LGPL v2.1
|
||||
GNU GPL v2"
|
||||
COPYRIGHT="2000-2003 Fabrice Bellard
|
||||
2003-2012 the FFmpeg developers"
|
||||
@@ -9,7 +9,8 @@ DEPEND="media-libs/libogg >= 1.3.0
|
||||
media-libs/libtheora >= 1.1.0
|
||||
media-libs/libvorbis >= 1.3.2
|
||||
media-libs/libvpx >= 1.0.0"
|
||||
BUILD {
|
||||
BUILD()
|
||||
{
|
||||
cd ffmpeg-0.11.1
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
|
||||
--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \
|
||||
@@ -17,7 +18,8 @@ BUILD {
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
INSTALL()
|
||||
{
|
||||
cd ffmpeg-0.11.1
|
||||
make install
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library."
|
||||
HOMEPAGE="http://www.ffmpeg.org"
|
||||
SRC_URI="http://ffmpeg.org/releases/ffmpeg-0.5.tar.bz2"
|
||||
CHECKSUM_MD5="be8503f15c3b81ba00eb8379ca8dcf33"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd ffmpeg-0.5
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd ffmpeg-0.5
|
||||
make install
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library."
|
||||
HOMEPAGE="http://www.ffmpeg.org"
|
||||
SRC_URI="http://ffmpeg.org/releases/ffmpeg-0.6.tar.bz2"
|
||||
CHECKSUM_MD5="d6142a9a5821d6a6262a6edb903faa24"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd ffmpeg-0.6
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd ffmpeg-0.6
|
||||
make install
|
||||
}
|
||||
|
||||
LICENSE="GNU LGPL v2.1
|
||||
GNU GPL v2"
|
||||
COPYRIGHT="2000-2003 Fabrice Bellard
|
||||
2003-2010 the FFmpeg developers"
|
||||
@@ -5,14 +5,16 @@ SRC_URI="svn://svn.ffmpeg.org/ffmpeg/trunk#23081"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
BUILD()
|
||||
{
|
||||
cd ffmpeg-23081
|
||||
chmod 777 configure
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
INSTALL()
|
||||
{
|
||||
cd ffmpeg-23081
|
||||
make install
|
||||
}
|
||||
@@ -5,14 +5,16 @@ SRC_URI="svn://svn.ffmpeg.org/ffmpeg/trunk#7407"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="broken"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
BUILD()
|
||||
{
|
||||
cd ffmpeg-7407
|
||||
chmod 777 configure
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl --enable-pp
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
INSTALL()
|
||||
{
|
||||
cd ffmpeg-7407
|
||||
make install
|
||||
}
|
||||
@@ -210,8 +210,8 @@ index e1ba799..3820056 100644
|
||||
av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n",
|
||||
av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat));
|
||||
diff --git a/configure b/configure
|
||||
--- ffmpeg-0.10.2/configure 2012-01-26 22:15:59.047710208 +0000
|
||||
+++ ffmpeg-0.10-haiku/configure 2012-03-28 22:30:34.330563584 +0000
|
||||
--- ffmpeg-0.10.2/configure
|
||||
+++ ffmpeg-0.10-haiku/configure
|
||||
@@ -1359,7 +1359,6 @@
|
||||
|
||||
aligned_stack_if_any="ppc x86"
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
diff -urN ffmpeg-0.5/configure ffmpeg-0.5-haiku/configure
|
||||
--- ffmpeg-0.5/configure 2009-03-01 17:57:14.000000000 +0000
|
||||
+++ ffmpeg-0.5-haiku/configure 2009-10-18 22:24:38.000000000 +0000
|
||||
@@ -1483,7 +1483,7 @@
|
||||
|
||||
# OS specific
|
||||
case $target_os in
|
||||
- beos|haiku|zeta)
|
||||
+ beos|zeta)
|
||||
prefix_default="$HOME/config"
|
||||
# helps building libavcodec
|
||||
add_cflags -DPIC -fomit-frame-pointer
|
||||
@@ -1509,6 +1509,13 @@
|
||||
enable beos_netserver
|
||||
network_extralibs="-lnet"
|
||||
fi ;;
|
||||
+ haiku)
|
||||
+ prefix_default="/boot/common"
|
||||
+ SHFLAGS=' -shared'
|
||||
+ disable audio_beos
|
||||
+ enable beosthreads
|
||||
+ network_extralibs="-lnetwork"
|
||||
+ ;;
|
||||
sunos)
|
||||
FFSERVERLDFLAGS=""
|
||||
SHFLAGS='-shared -Wl,-h,$$(@F)'
|
||||
@@ -1,22 +0,0 @@
|
||||
--- ffmpeg-0.6/configure 2010-06-15 19:44:30.020447232 +0000
|
||||
+++ ffmpeg-0.6-haiku/configure 2010-07-13 20:40:48.244056064 +0000
|
||||
@@ -2127,7 +2127,7 @@
|
||||
|
||||
# OS specific
|
||||
case $target_os in
|
||||
- beos|haiku|zeta)
|
||||
+ beos|zeta)
|
||||
prefix_default="$HOME/config"
|
||||
# 3 gcc releases known for BeOS, each with ugly bugs
|
||||
gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
|
||||
@@ -2151,6 +2148,10 @@
|
||||
enable beos_netserver
|
||||
network_extralibs="-lnet"
|
||||
fi ;;
|
||||
+ haiku)
|
||||
+ prefix_default="/boot/common"
|
||||
+ network_extralibs="-lnetwork"
|
||||
+ ;;
|
||||
sunos)
|
||||
FFSERVERLDFLAGS=""
|
||||
SHFLAGS='-shared -Wl,-h,$$(@F)'
|
||||
@@ -23,7 +23,8 @@ DEPEND="media-video/ffmpeg >= 0.5
|
||||
#
|
||||
|
||||
|
||||
BUILD {
|
||||
BUILD()
|
||||
{
|
||||
if test ! -e gnash; then
|
||||
bzr branch http://bzr.savannah.gnu.org/r/gnash/trunk/ gnash || true;
|
||||
fi
|
||||
@@ -67,7 +68,8 @@ BUILD {
|
||||
|
||||
popd
|
||||
}
|
||||
INSTALL {
|
||||
INSTALL()
|
||||
{
|
||||
cd gnash
|
||||
setgcc gcc4
|
||||
make install "CXXFLAGS=-I/boot/common/include/boost-1_38/"
|
||||
@@ -103,7 +105,7 @@ INSTALL {
|
||||
done
|
||||
strip --strip-debug boot/apps/Gnash/haiku-gnash || true
|
||||
|
||||
xres -o boot/apps/Gnash/haiku-gnash -a VICN:101:BEOS:ICON $ROOTDIR/gnash.hvif
|
||||
xres -o boot/apps/Gnash/haiku-gnash -a VICN:101:BEOS:ICON $ROOTDIR/additional-files/gnash.hvif
|
||||
|
||||
popd
|
||||
|
||||
@@ -14,7 +14,8 @@ DEPEND="dev-libs/libxml2 >= 2.7.7
|
||||
media-libs/libass >= 0.9.9
|
||||
media-libs/dvdread >= 4.1.3"
|
||||
|
||||
BUILD {
|
||||
BUILD()
|
||||
{
|
||||
cd HandBrake-0.9.5
|
||||
cp make/variant/linux.defs make/variant/haiku.defs
|
||||
|
||||
@@ -35,7 +36,8 @@ BUILD {
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
INSTALL()
|
||||
{
|
||||
cd HandBrake-0.9.5
|
||||
make install
|
||||
}
|
||||
@@ -16,7 +16,8 @@ DEPEND="pkgconfig >= 0.23
|
||||
media-libs/libdvdread >= 4.1.3
|
||||
media-libs/libdvdnav >= 4.1.3"
|
||||
|
||||
BUILD {
|
||||
BUILD()
|
||||
{
|
||||
cd mplayer-1.0
|
||||
cp /boot/common/share/libtool/config/config.* .
|
||||
libtoolize --force --copy --install
|
||||
@@ -28,7 +29,8 @@ BUILD {
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
INSTALL()
|
||||
{
|
||||
cd mplayer-1.0
|
||||
make install
|
||||
}
|
||||
@@ -1,529 +0,0 @@
|
||||
diff -ur vlc-0.8.6i-original/configure.ac vlc-0.8.6i/configure.ac
|
||||
--- vlc-0.8.6i-original/configure.ac 2008-07-08 21:59:22.000000000 +0100
|
||||
+++ vlc-0.8.6i/configure.ac 2009-11-07 23:47:24.000000000 +0000
|
||||
@@ -270,6 +270,12 @@
|
||||
VLC_ADD_LDFLAGS([beos],[-lzeta])
|
||||
fi
|
||||
;;
|
||||
+ haiku)
|
||||
+ SYS=beos
|
||||
+ VLC_ADD_CXXFLAGS([beos],[])
|
||||
+ VLC_ADD_LDFLAGS([vlc logger],[-lbe])
|
||||
+ VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame])
|
||||
+ ;;
|
||||
*)
|
||||
SYS="${target_os}"
|
||||
;;
|
||||
diff -ur vlc-0.8.6i-original/include/vlc_common.h vlc-0.8.6i/include/vlc_common.h
|
||||
--- vlc-0.8.6i-original/include/vlc_common.h 2008-07-08 21:59:23.000000000 +0100
|
||||
+++ vlc-0.8.6i/include/vlc_common.h 2009-11-08 00:28:56.000000000 +0000
|
||||
@@ -898,7 +898,7 @@
|
||||
# define vlc_strtoll NULL
|
||||
#endif
|
||||
|
||||
-#if defined(SYS_BEOS) \
|
||||
+#if defined(SYS_BEOS) && !(defined(__HAIKU__))\
|
||||
|| (defined (__FreeBSD__) && (__FreeBSD__ < 5))
|
||||
typedef struct {
|
||||
long long quot; /* Quotient. */
|
||||
diff -ur vlc-0.8.6i-original/include/vlc_threads.h vlc-0.8.6i/include/vlc_threads.h
|
||||
--- vlc-0.8.6i-original/include/vlc_threads.h 2008-07-08 21:59:23.000000000 +0100
|
||||
+++ vlc-0.8.6i/include/vlc_threads.h 2009-11-07 23:53:51.000000000 +0000
|
||||
@@ -45,7 +45,7 @@
|
||||
#elif defined( HAVE_KERNEL_SCHEDULER_H ) /* BeOS */
|
||||
# include <kernel/OS.h>
|
||||
# include <kernel/scheduler.h>
|
||||
-# include <byteorder.h>
|
||||
+# include <ByteOrder.h>
|
||||
|
||||
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) /* pthreads (like Linux & BSD) */
|
||||
# include <pthread.h>
|
||||
diff -ur vlc-0.8.6i-original/modules/codec/cinepak.c vlc-0.8.6i/modules/codec/cinepak.c
|
||||
--- vlc-0.8.6i-original/modules/codec/cinepak.c 2008-07-08 21:59:23.000000000 +0100
|
||||
+++ vlc-0.8.6i/modules/codec/cinepak.c 2009-11-08 00:57:55.000000000 +0000
|
||||
@@ -279,7 +279,7 @@
|
||||
int i_strip, int i_x, int i_y,
|
||||
int i_x2, int i_y2, uint8_t *p_data )
|
||||
{
|
||||
- uint8_t i_index[4];
|
||||
+ uint8_t i_index[4], *p_dst_y, *p_dst_u, *p_dst_v;
|
||||
int i,j;
|
||||
|
||||
size_t y_max = p_context->i_stride[0] * ( i_y + 5 ) + i_x + 5;
|
||||
@@ -292,7 +292,7 @@
|
||||
if( y_max >= y_siz || u_max >= u_siz || v_max >= v_siz )
|
||||
return;
|
||||
|
||||
- uint8_t *p_dst_y, *p_dst_u, *p_dst_v;
|
||||
+
|
||||
#define PIX_SET_Y( x, y, v ) \
|
||||
p_dst_y[(x) + (y)* p_context->i_stride[0]] = (v);
|
||||
|
||||
@@ -336,7 +336,7 @@
|
||||
int i_strip, int i_x, int i_y,
|
||||
int i_x2, int i_y2, uint8_t *p_data )
|
||||
{
|
||||
- uint8_t i_index;
|
||||
+ uint8_t i_index, *p_dst_y, *p_dst_u, *p_dst_v;
|
||||
int i,j;
|
||||
|
||||
size_t y_max = p_context->i_stride[0] * ( i_y + 5 ) + i_x + 5;
|
||||
@@ -349,7 +349,6 @@
|
||||
if( y_max >= y_siz || u_max >= u_siz || v_max >= v_siz )
|
||||
return;
|
||||
|
||||
- uint8_t *p_dst_y, *p_dst_u, *p_dst_v;
|
||||
#define PIX_SET_Y( x, y, v ) \
|
||||
p_dst_y[(x) + (y)* p_context->i_stride[0]] = (v);
|
||||
|
||||
diff -ur vlc-0.8.6i-original/modules/codec/telx.c vlc-0.8.6i/modules/codec/telx.c
|
||||
--- vlc-0.8.6i-original/modules/codec/telx.c 2008-07-08 21:59:23.000000000 +0100
|
||||
+++ vlc-0.8.6i/modules/codec/telx.c 2009-11-08 00:59:26.000000000 +0000
|
||||
@@ -450,7 +450,7 @@
|
||||
vlc_bool_t b_update = VLC_FALSE;
|
||||
char psz_text[512], *pt = psz_text;
|
||||
char psz_line[256];
|
||||
- int i, total;
|
||||
+ int i, total, mpag, row, magazine;
|
||||
|
||||
if( pp_block == NULL || *pp_block == NULL ) return NULL;
|
||||
p_block = *pp_block;
|
||||
@@ -473,8 +473,7 @@
|
||||
/* continue; */
|
||||
/* } */
|
||||
|
||||
- int mpag = (hamming_8_4( packet[4] ) << 4) | hamming_8_4( packet[5] );
|
||||
- int row, magazine;
|
||||
+ mpag = (hamming_8_4( packet[4] ) << 4) | hamming_8_4( packet[5] );
|
||||
if ( mpag < 0 )
|
||||
{
|
||||
/* decode error */
|
||||
diff -ur vlc-0.8.6i-original/modules/demux/a52.c vlc-0.8.6i/modules/demux/a52.c
|
||||
--- vlc-0.8.6i-original/modules/demux/a52.c 2008-07-08 21:59:23.000000000 +0100
|
||||
+++ vlc-0.8.6i/modules/demux/a52.c 2009-11-08 01:00:41.000000000 +0000
|
||||
@@ -80,7 +80,7 @@
|
||||
demux_t *p_demux = (demux_t*)p_this;
|
||||
demux_sys_t *p_sys;
|
||||
byte_t *p_peek;
|
||||
- int i_peek = 0;
|
||||
+ int i_peek = 0, i_size;
|
||||
vlc_bool_t b_big_endian = 0; /* Arbitrary initialisation */
|
||||
|
||||
/* Check if we are dealing with a WAV file */
|
||||
@@ -104,7 +104,7 @@
|
||||
|
||||
/* Some A52 wav files don't begin with a sync code so we do a more
|
||||
* extensive search */
|
||||
- int i_size = stream_Peek( p_demux->s, &p_peek, i_peek + A52_PACKET_SIZE * 2);
|
||||
+ i_size = stream_Peek( p_demux->s, &p_peek, i_peek + A52_PACKET_SIZE * 2);
|
||||
i_size -= (PCM_FRAME_SIZE + A52_MAX_HEADER_SIZE);
|
||||
|
||||
while( i_peek < i_size )
|
||||
diff -ur vlc-0.8.6i-original/modules/demux/dts.c vlc-0.8.6i/modules/demux/dts.c
|
||||
--- vlc-0.8.6i-original/modules/demux/dts.c 2008-07-08 21:59:23.000000000 +0100
|
||||
+++ vlc-0.8.6i/modules/demux/dts.c 2009-11-08 01:01:49.000000000 +0000
|
||||
@@ -74,7 +74,8 @@
|
||||
demux_t *p_demux = (demux_t*)p_this;
|
||||
demux_sys_t *p_sys;
|
||||
byte_t * p_peek;
|
||||
- int i_peek = 0;
|
||||
+ int i_peek = 0, i_size;
|
||||
+ uint32_t i_len;
|
||||
|
||||
/* Check if we are dealing with a WAV file */
|
||||
if( stream_Peek( p_demux->s, &p_peek, 20 ) == 20 &&
|
||||
@@ -94,7 +95,7 @@
|
||||
}
|
||||
|
||||
/* Sanity check the wave format header */
|
||||
- uint32_t i_len = GetDWLE( p_peek + i_peek - 4 );
|
||||
+ i_len = GetDWLE( p_peek + i_peek - 4 );
|
||||
if( i_len > DTS_PROBE_SIZE )
|
||||
return VLC_EGENERIC;
|
||||
|
||||
@@ -124,7 +125,7 @@
|
||||
|
||||
/* Some DTS wav files don't begin with a sync code so we do a more
|
||||
* extensive search */
|
||||
- int i_size = stream_Peek( p_demux->s, &p_peek, DTS_PROBE_SIZE );
|
||||
+ i_size = stream_Peek( p_demux->s, &p_peek, DTS_PROBE_SIZE );
|
||||
i_size -= DTS_MAX_HEADER_SIZE;
|
||||
|
||||
while( i_peek < i_size )
|
||||
diff -ur vlc-0.8.6i-original/modules/gui/beos/InterfaceWindow.cpp vlc-0.8.6i/modules/gui/beos/InterfaceWindow.cpp
|
||||
--- vlc-0.8.6i-original/modules/gui/beos/InterfaceWindow.cpp 2008-07-08 21:59:23.000000000 +0100
|
||||
+++ vlc-0.8.6i/modules/gui/beos/InterfaceWindow.cpp 2009-11-08 01:03:41.000000000 +0000
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <SupportKit.h>
|
||||
#include <malloc.h>
|
||||
#include <scsi.h>
|
||||
-#include <scsiprobe_driver.h>
|
||||
+//#include <scsiprobe_driver.h>
|
||||
#include <fs_info.h>
|
||||
#include <string.h>
|
||||
|
||||
diff -ur vlc-0.8.6i-original/modules/misc/network/ipv6.c vlc-0.8.6i/modules/misc/network/ipv6.c
|
||||
--- vlc-0.8.6i-original/modules/misc/network/ipv6.c 2008-07-08 21:59:24.000000000 +0100
|
||||
+++ vlc-0.8.6i/modules/misc/network/ipv6.c 2009-11-08 01:12:23.000000000 +0000
|
||||
@@ -239,6 +239,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
+#ifndef __HAIKU__
|
||||
/* Join the multicast group if the socket is a multicast address */
|
||||
if( IN6_IS_ADDR_MULTICAST(&loc.sin6_addr) )
|
||||
{
|
||||
@@ -384,4 +385,5 @@
|
||||
p_socket->i_mtu = val.i_int;
|
||||
|
||||
return 0;
|
||||
+ #endif
|
||||
}
|
||||
diff -ur vlc-0.8.6i-original/modules/mux/mpeg/ts.c vlc-0.8.6i/modules/mux/mpeg/ts.c
|
||||
--- vlc-0.8.6i-original/modules/mux/mpeg/ts.c 2008-07-08 21:59:24.000000000 +0100
|
||||
+++ vlc-0.8.6i/modules/mux/mpeg/ts.c 2009-11-08 01:15:10.000000000 +0000
|
||||
@@ -1719,27 +1719,30 @@
|
||||
static block_t *Add_ADTS( block_t *p_data, es_format_t *p_fmt )
|
||||
{
|
||||
uint8_t *p_extra = p_fmt->p_extra;
|
||||
+ int i_index, i_profile, i_channels, i_fullness;
|
||||
+ uint8_t *p_buffer;
|
||||
+ block_t *p_bak_block, *p_new_block;
|
||||
|
||||
if( !p_data || p_fmt->i_extra < 2 || !p_extra )
|
||||
return p_data; /* no data to construct the headers */
|
||||
|
||||
- int i_index = ( (p_extra[0] << 1) | (p_extra[1] >> 7) ) & 0x0f;
|
||||
- int i_profile = (p_extra[0] >> 3) - 1; /* i_profile < 4 */
|
||||
+ i_index = ( (p_extra[0] << 1) | (p_extra[1] >> 7) ) & 0x0f;
|
||||
+ i_profile = (p_extra[0] >> 3) - 1; /* i_profile < 4 */
|
||||
|
||||
if( i_index == 0x0f && p_fmt->i_extra < 5 )
|
||||
return p_data; /* not enough data */
|
||||
|
||||
- int i_channels = (p_extra[i_index == 0x0f ? 4 : 1] >> 3) & 0x0f;
|
||||
+ i_channels = (p_extra[i_index == 0x0f ? 4 : 1] >> 3) & 0x0f;
|
||||
|
||||
#define ADTS_HEADER_SIZE 7 /* CRC needs 2 more bytes */
|
||||
|
||||
|
||||
/* keep a copy in case block_Realloc() fails */
|
||||
- block_t *p_bak_block = block_Duplicate( p_data );
|
||||
+ p_bak_block = block_Duplicate( p_data );
|
||||
if( !p_bak_block ) /* OOM, block_Realloc() is likely to lose our block */
|
||||
return p_data; /* the frame isn't correct but that's the best we have */
|
||||
|
||||
- block_t *p_new_block = block_Realloc( p_data, ADTS_HEADER_SIZE,
|
||||
+ p_new_block = block_Realloc( p_data, ADTS_HEADER_SIZE,
|
||||
p_data->i_buffer );
|
||||
if( !p_new_block )
|
||||
return p_bak_block; /* OOM, send the (incorrect) original frame */
|
||||
@@ -1747,7 +1750,7 @@
|
||||
block_Release( p_bak_block ); /* we don't need the copy anymore */
|
||||
|
||||
|
||||
- uint8_t *p_buffer = p_new_block->p_buffer;
|
||||
+ p_buffer = p_new_block->p_buffer;
|
||||
|
||||
/* fixed header */
|
||||
p_buffer[0] = 0xff;
|
||||
@@ -1757,7 +1760,7 @@
|
||||
|
||||
/* variable header (starts at last 2 bits of 4th byte) */
|
||||
|
||||
- int i_fullness = 0x7ff; /* 0x7ff means VBR */
|
||||
+ i_fullness = 0x7ff; /* 0x7ff means VBR */
|
||||
/* XXX: We should check if it's CBR or VBR, but no known implementation
|
||||
* do that, and it's a pain to calculate this field */
|
||||
|
||||
diff -ur vlc-0.8.6i-original/modules/packetizer/h264.c vlc-0.8.6i/modules/packetizer/h264.c
|
||||
--- vlc-0.8.6i-original/modules/packetizer/h264.c 2008-07-08 21:59:24.000000000 +0100
|
||||
+++ vlc-0.8.6i/modules/packetizer/h264.c 2009-11-08 01:21:24.000000000 +0000
|
||||
@@ -219,13 +219,14 @@
|
||||
i_sps = (*p++)&0x1f;
|
||||
for( i = 0; i < i_sps; i++ )
|
||||
{
|
||||
+ block_t *p_sps;
|
||||
uint16_t i_length = GetWBE( p ); p += 2;
|
||||
if( i_length >
|
||||
(uint8_t*)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra - p )
|
||||
{
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
- block_t *p_sps = nal_get_annexeb( p_dec, p, i_length );
|
||||
+ p_sps = nal_get_annexeb( p_dec, p, i_length );
|
||||
if( !p_sps )
|
||||
return VLC_EGENERIC;
|
||||
p_sys->p_sps = block_Duplicate( p_sps );
|
||||
@@ -237,13 +238,14 @@
|
||||
i_pps = *p++;
|
||||
for( i = 0; i < i_pps; i++ )
|
||||
{
|
||||
+ block_t *p_pps;
|
||||
uint16_t i_length = GetWBE( p ); p += 2;
|
||||
if( i_length >
|
||||
(uint8_t*)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra - p )
|
||||
{
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
- block_t *p_pps = nal_get_annexeb( p_dec, p, i_length );
|
||||
+ p_pps = nal_get_annexeb( p_dec, p, i_length );
|
||||
if( !p_pps )
|
||||
return VLC_EGENERIC;
|
||||
p_sys->p_pps = block_Duplicate( p_pps );
|
||||
@@ -446,7 +448,7 @@
|
||||
|
||||
for( p = p_block->p_buffer; p < &p_block->p_buffer[p_block->i_buffer]; )
|
||||
{
|
||||
- block_t *p_pic;
|
||||
+ block_t *p_pic, *p_part;
|
||||
int i_size = 0;
|
||||
int i;
|
||||
|
||||
@@ -462,7 +464,7 @@
|
||||
break;
|
||||
}
|
||||
|
||||
- block_t *p_part = nal_get_annexeb( p_dec, p, i_size );
|
||||
+ p_part = nal_get_annexeb( p_dec, p, i_size );
|
||||
if( !p_part )
|
||||
break;
|
||||
p_part->i_dts = p_block->i_dts;
|
||||
diff -ur vlc-0.8.6i-original/modules/packetizer/mpeg4audio.c vlc-0.8.6i/modules/packetizer/mpeg4audio.c
|
||||
--- vlc-0.8.6i-original/modules/packetizer/mpeg4audio.c 2008-07-08 21:59:24.000000000 +0100
|
||||
+++ vlc-0.8.6i/modules/packetizer/mpeg4audio.c 2009-11-08 01:18:22.000000000 +0000
|
||||
@@ -332,6 +332,7 @@
|
||||
{
|
||||
int i_profile, i_sample_rate_idx, i_frame_size;
|
||||
vlc_bool_t b_crc;
|
||||
+ unsigned short i_raw_blocks_in_frame;
|
||||
|
||||
/* Fixed header between frames */
|
||||
//int i_id = ( (p_buf[1] >> 3) & 0x01) ? 2 : 4; /* MPEG-2 or 4 */
|
||||
@@ -350,7 +351,7 @@
|
||||
i_frame_size = ((p_buf[3] & 0x03) << 11) | (p_buf[4] << 3) |
|
||||
((p_buf[5] >> 5) /*& 0x7*/);
|
||||
//uint16_t buffer_fullness = ((p_buf[5] & 0x1f) << 6) | (p_buf[6] >> 2);
|
||||
- unsigned short i_raw_blocks_in_frame = p_buf[6] & 0x03;
|
||||
+ i_raw_blocks_in_frame = p_buf[6] & 0x03;
|
||||
|
||||
if( !*pi_sample_rate || !*pi_channels || !i_frame_size )
|
||||
{
|
||||
@@ -436,15 +437,16 @@
|
||||
{
|
||||
/* TODO compute channels count ? */
|
||||
int i_tag = bs_read( s, 4 );
|
||||
- if( i_tag != 0x05 )
|
||||
- return -1;
|
||||
- bs_skip( s, 2 + 4 ); // object type + sampling index
|
||||
int i_num_front = bs_read( s, 4 );
|
||||
int i_num_side = bs_read( s, 4 );
|
||||
int i_num_back = bs_read( s, 4 );
|
||||
int i_num_lfe = bs_read( s, 2 );
|
||||
int i_num_assoc_data = bs_read( s, 3 );
|
||||
int i_num_valid_cc = bs_read( s, 4 );
|
||||
+ int i_comment;
|
||||
+ if( i_tag != 0x05 )
|
||||
+ return -1;
|
||||
+ bs_skip( s, 2 + 4 ); // object type + sampling index
|
||||
|
||||
if( bs_read1(s) )
|
||||
bs_skip( s, 4 ); // mono downmix
|
||||
@@ -460,19 +462,20 @@
|
||||
bs_skip( s, i_num_assoc_data * (4) );
|
||||
bs_skip( s, i_num_valid_cc * (5) );
|
||||
bs_align( s );
|
||||
- int i_comment = bs_read( s, 8 );
|
||||
+ i_comment = bs_read( s, 8 );
|
||||
bs_skip( s, i_comment * 8 );
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int Mpeg4GASpecificConfig( mpeg4_cfg_t *p_cfg, bs_t *s )
|
||||
{
|
||||
+ int i_extension_flag;
|
||||
p_cfg->i_frame_length = bs_read1(s) ? 960 : 1024;
|
||||
|
||||
if( bs_read1( s ) ) // depend on core coder
|
||||
bs_skip( s, 14 ); // core coder delay
|
||||
|
||||
- int i_extension_flag = bs_read1( s );
|
||||
+ i_extension_flag = bs_read1( s );
|
||||
if( p_cfg->i_channel == 0 )
|
||||
{
|
||||
Mpeg4GAProgramConfigElement( s );
|
||||
diff -ur vlc-0.8.6i-original/modules/stream_out/mosaic_bridge.c vlc-0.8.6i/modules/stream_out/mosaic_bridge.c
|
||||
--- vlc-0.8.6i-original/modules/stream_out/mosaic_bridge.c 2008-07-08 21:59:24.000000000 +0100
|
||||
+++ vlc-0.8.6i/modules/stream_out/mosaic_bridge.c 2009-11-08 01:22:30.000000000 +0000
|
||||
@@ -339,11 +339,12 @@
|
||||
|
||||
if ( p_sys->p_decoder != NULL )
|
||||
{
|
||||
+ void *p_owner;
|
||||
picture_t **pp_ring = p_sys->p_decoder->p_owner->pp_pics;
|
||||
|
||||
if( p_sys->p_decoder->p_module )
|
||||
module_Unneed( p_sys->p_decoder, p_sys->p_decoder->p_module );
|
||||
- void *p_owner = p_sys->p_decoder->p_owner;
|
||||
+ p_owner = p_sys->p_decoder->p_owner;
|
||||
vlc_object_detach( p_sys->p_decoder );
|
||||
vlc_object_destroy( p_sys->p_decoder );
|
||||
|
||||
diff -ur vlc-0.8.6i-original/modules/stream_out/switcher.c vlc-0.8.6i/modules/stream_out/switcher.c
|
||||
--- vlc-0.8.6i-original/modules/stream_out/switcher.c 2008-07-08 21:59:24.000000000 +0100
|
||||
+++ vlc-0.8.6i/modules/stream_out/switcher.c 2009-11-08 01:23:24.000000000 +0000
|
||||
@@ -657,8 +657,9 @@
|
||||
|
||||
if ( i_len > 0 )
|
||||
{
|
||||
+ int i_cmd;
|
||||
psz_buffer[i_len] = '\0';
|
||||
- int i_cmd = strtol( psz_buffer, NULL, 0 );
|
||||
+ i_cmd = strtol( psz_buffer, NULL, 0 );
|
||||
if ( i_cmd < -1 || i_cmd > p_sys->i_nb_pictures )
|
||||
{
|
||||
msg_Err( p_stream, "got a wrong command (%d)", i_cmd );
|
||||
diff -ur vlc-0.8.6i-original/src/extras/libc.c vlc-0.8.6i/src/extras/libc.c
|
||||
--- vlc-0.8.6i-original/src/extras/libc.c 2008-07-08 22:08:36.000000000 +0100
|
||||
+++ vlc-0.8.6i/src/extras/libc.c 2009-11-08 00:44:49.000000000 +0000
|
||||
@@ -348,7 +348,7 @@
|
||||
/*****************************************************************************
|
||||
* lldiv: returns quotient and remainder
|
||||
*****************************************************************************/
|
||||
-#if defined(SYS_BEOS) \
|
||||
+#if defined(SYS_BEOS) & !(defined(__HAIKU__))\
|
||||
|| (defined (__FreeBSD__) && (__FreeBSD__ < 5))
|
||||
lldiv_t vlc_lldiv( long long numer, long long denom )
|
||||
{
|
||||
diff -ur vlc-0.8.6i-original/src/input/input.c vlc-0.8.6i/src/input/input.c
|
||||
--- vlc-0.8.6i-original/src/input/input.c 2008-07-08 22:08:36.000000000 +0100
|
||||
+++ vlc-0.8.6i/src/input/input.c 2009-11-08 00:30:10.000000000 +0000
|
||||
@@ -1913,11 +1913,11 @@
|
||||
{
|
||||
vlc_meta_t *tk = p_meta->track[i];
|
||||
int j;
|
||||
+ char *psz_cat;
|
||||
|
||||
if( tk->i_meta > 0 )
|
||||
{
|
||||
msg_Dbg( p_input, " - track[%d]:", i );
|
||||
- char *psz_cat;
|
||||
if( asprintf( &psz_cat, "%s %d", _("Stream"), i ) != -1 )
|
||||
{
|
||||
for( j = 0; j < tk->i_meta; j++ )
|
||||
diff -ur vlc-0.8.6i-original/src/misc/beos_specific.cpp vlc-0.8.6i/src/misc/beos_specific.cpp
|
||||
--- vlc-0.8.6i-original/src/misc/beos_specific.cpp 2008-07-08 22:08:36.000000000 +0100
|
||||
+++ vlc-0.8.6i/src/misc/beos_specific.cpp 2009-11-09 18:46:51.000000000 +0000
|
||||
@@ -154,7 +154,7 @@
|
||||
{
|
||||
BAlert *alert;
|
||||
alert = new BAlert( "VLC " PACKAGE_VERSION,
|
||||
- "VLC " PACKAGE_VERSION " for BeOS\n\n"
|
||||
+ "VLC " PACKAGE_VERSION " for Haiku\n\n"
|
||||
"<www.videolan.org>", "OK");
|
||||
alert->Go( NULL );
|
||||
}
|
||||
diff -ur vlc-0.8.6i-original/src/misc/threads.c vlc-0.8.6i/src/misc/threads.c
|
||||
--- vlc-0.8.6i-original/src/misc/threads.c 2008-07-08 22:08:36.000000000 +0100
|
||||
+++ vlc-0.8.6i/src/misc/threads.c 2009-11-08 17:02:02.000000000 +0000
|
||||
@@ -647,6 +647,7 @@
|
||||
int __vlc_thread_set_priority( vlc_object_t *p_this, char * psz_file,
|
||||
int i_line, int i_priority )
|
||||
{
|
||||
+/*
|
||||
#if defined( PTH_INIT_IN_PTH_H ) || defined( ST_INIT_IN_ST_H )
|
||||
#elif defined( WIN32 ) || defined( UNDER_CE )
|
||||
if( !SetThreadPriority(GetCurrentThread(), i_priority) )
|
||||
@@ -689,7 +690,7 @@
|
||||
}
|
||||
}
|
||||
#endif
|
||||
-
|
||||
+*/
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -790,3 +791,7 @@
|
||||
p_this->b_thread = 0;
|
||||
}
|
||||
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
Only in vlc-0.8.6i-original/src/misc: version.c
|
||||
diff -ur vlc-0.8.6i-original/src/misc/vlm.c vlc-0.8.6i/src/misc/vlm.c
|
||||
--- vlc-0.8.6i-original/src/misc/vlm.c 2008-07-08 22:08:36.000000000 +0100
|
||||
+++ vlc-0.8.6i/src/misc/vlm.c 2009-11-08 00:42:59.000000000 +0000
|
||||
@@ -1368,10 +1368,11 @@
|
||||
|
||||
vlm_schedule_t *vlm_ScheduleNew( vlm_t *vlm, const char *psz_name )
|
||||
{
|
||||
+ vlm_schedule_t *p_sched;
|
||||
if( !psz_name )
|
||||
return NULL;
|
||||
|
||||
- vlm_schedule_t *p_sched = malloc( sizeof( vlm_schedule_t ) );
|
||||
+ p_sched = malloc( sizeof( vlm_schedule_t ) );
|
||||
if( !p_sched )
|
||||
return NULL;
|
||||
|
||||
diff -ur vlc-0.8.6i-original/src/network/httpd.c vlc-0.8.6i/src/network/httpd.c
|
||||
--- vlc-0.8.6i-original/src/network/httpd.c 2008-07-08 22:08:36.000000000 +0100
|
||||
+++ vlc-0.8.6i/src/network/httpd.c 2009-11-08 00:33:09.000000000 +0000
|
||||
@@ -365,7 +365,7 @@
|
||||
static int httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, httpd_message_t *answer, httpd_message_t *query )
|
||||
{
|
||||
httpd_file_t *file = (httpd_file_t*)p_sys;
|
||||
- uint8_t **pp_body, *p_body;
|
||||
+ uint8_t **pp_body, *p_body, *psz_args;
|
||||
char *psz_connection = NULL;
|
||||
int *pi_body, i_body;
|
||||
|
||||
@@ -402,7 +402,7 @@
|
||||
/* msg_Warn not supported */
|
||||
}
|
||||
|
||||
- uint8_t *psz_args = query->psz_args;
|
||||
+ psz_args = query->psz_args;
|
||||
file->pf_fill( file->p_sys, file, psz_args, pp_body, pi_body );
|
||||
|
||||
if( query->i_type == HTTPD_MSG_HEAD && p_body != NULL )
|
||||
@@ -487,6 +487,7 @@
|
||||
{
|
||||
httpd_handler_t *handler = (httpd_handler_t*)p_sys;
|
||||
char psz_remote_addr[NI_MAXNUMERICHOST];
|
||||
+ uint8_t *psz_args;
|
||||
|
||||
if( answer == NULL || query == NULL )
|
||||
{
|
||||
@@ -502,7 +503,7 @@
|
||||
if( httpd_ClientIP( cl, psz_remote_addr ) == NULL )
|
||||
*psz_remote_addr = '\0';
|
||||
|
||||
- uint8_t *psz_args = query->psz_args;
|
||||
+ psz_args = query->psz_args;
|
||||
handler->pf_fill( handler->p_sys, handler, query->psz_url, psz_args,
|
||||
query->i_type, query->p_body, query->i_body,
|
||||
psz_remote_addr, NULL,
|
||||
diff -ur vlc-0.8.6i-original/src/stream_output/sap.c vlc-0.8.6i/src/stream_output/sap.c
|
||||
--- vlc-0.8.6i-original/src/stream_output/sap.c 2008-07-08 22:08:36.000000000 +0100
|
||||
+++ vlc-0.8.6i/src/stream_output/sap.c 2009-11-08 01:26:17.000000000 +0000
|
||||
@@ -287,7 +287,8 @@
|
||||
|
||||
memcpy( a6->s6_addr + 2, "\x00\x00\x00\x00\x00\x00"
|
||||
"\x00\x00\x00\x00\x00\x02\x7f\xfe", 14 );
|
||||
- if( IN6_IS_ADDR_MULTICAST( a6 ) )
|
||||
+ #ifndef __HAIKU__
|
||||
+ if( IN6_IS_ADDR_MULTICAST( a6 ) )
|
||||
{
|
||||
/* SSM <=> ff3x::/32 */
|
||||
b_ssm = (U32_AT (a6->s6_addr) & 0xfff0ffff) == 0xff300000;
|
||||
@@ -301,6 +302,7 @@
|
||||
|
||||
b_ipv6 = VLC_TRUE;
|
||||
break;
|
||||
+ #endif
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -12,14 +12,16 @@ DEPEND="pkgconfig >= 0.23,
|
||||
libmad
|
||||
ffmpeg = 7407"
|
||||
CHECKSUM_MD5="fd852166d1705573cd7768a06117ed51"
|
||||
BUILD {
|
||||
BUILD()
|
||||
{
|
||||
cd vlc-0.8.6i
|
||||
libtoolize --force --copy --install
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
INSTALL()
|
||||
{
|
||||
cd vlc-0.8.6i
|
||||
make install
|
||||
}
|
||||
@@ -16,14 +16,16 @@ DEPEND="pkgconfig >= 0.23
|
||||
libdca
|
||||
ffmpeg >= 0.6"
|
||||
CHECKSUM_MD5="9ab7d8218ff37e362f996fd7d8879dbc"
|
||||
BUILD {
|
||||
BUILD()
|
||||
{
|
||||
cd vlc-1.1.5
|
||||
./bootstrap
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-postproc --disable-xcb --disable-skins2 --disable-qt4 --disable-libgcrypt --disable-remoteosd
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
INSTALL()
|
||||
{
|
||||
cd vlc-1.1.5
|
||||
make install
|
||||
}
|
||||
@@ -24,14 +24,16 @@ DEPEND="faad2,
|
||||
libsdl
|
||||
sdl-image"
|
||||
CHECKSUM_MD5="4f959c0766ada8cea5a72c65fce94ebe"
|
||||
BUILD {
|
||||
BUILD()
|
||||
{
|
||||
cd vlc-2.0.5
|
||||
bootstrap
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-kde-solid=no --disable-xcb --enable-run-as-root --enable-static
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
INSTALL()
|
||||
{
|
||||
cd vlc-2.0.5
|
||||
make install
|
||||
}
|
||||
Reference in New Issue
Block a user