jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1180 from awiouy/x264

Browse Source 
emby: reintroduce libx264
This commit is contained in:
Christian Hewitt 2017-01-16 06:42:45 +04:00 committed by GitHub
commit 5fdbcd9675
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
View File

@ -18,7 +18,7 @@
PKG_NAME="ffmpegx" PKG_NAME="ffmpegx"
PKG_VERSION="libreelec" PKG_VERSION="libreelec"
PKG_REV="5" PKG_REV="6"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="LGPLv2.1+" PKG_LICENSE="LGPLv2.1+"
PKG_SITE="https://ffmpeg.org" PKG_SITE="https://ffmpeg.org"
@ -46,6 +46,11 @@ pre_configure_target() {
FFMPEG_RPI_HADE="--enable-mmal --enable-omx-rpi" FFMPEG_RPI_HADE="--enable-mmal --enable-omx-rpi"
fi fi
# ffmpeg does not build with libx264 on aarch64
if [ "$TARGET_ARCH" != "aarch64" ]; then
FFMPEG_X264="--enable-libx264"
fi
if [ "$TARGET_ARCH" == "arm" ]; then if [ "$TARGET_ARCH" == "arm" ]; then
FFMPEG_ARM_AO="--enable-hardcoded-tables" FFMPEG_ARM_AO="--enable-hardcoded-tables"
fi fi

3
packages/addons/service/emby/changelog.txt
View File

@ -1,3 +1,6 @@
110
- Rebuild ffmpegx with libx264
109 109
- Rebuilt ffmpgex and imagemagick - Rebuilt ffmpgex and imagemagick

2
packages/addons/service/emby/package.mk
View File

@ -18,7 +18,7 @@
PKG_NAME="emby" PKG_NAME="emby"
PKG_VERSION="3.0.8500" PKG_VERSION="3.0.8500"
PKG_REV="109" PKG_REV="110"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="OSS" PKG_LICENSE="OSS"
PKG_SITE="http://emby.media" PKG_SITE="http://emby.media"

1
packages/x11/lib/libX11/package.mk
View File

@ -56,4 +56,5 @@ pre_configure_target() {
export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS" export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
export CFLAGS_FOR_BUILD="$HOST_CFLAGS" export CFLAGS_FOR_BUILD="$HOST_CFLAGS"
export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS" export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
} }