summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/ffmpeg/Makefile14
-rw-r--r--package/libx265/Makefile32
2 files changed, 44 insertions, 2 deletions
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index f6f1fa12f..f874da9df 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= ffmpeg
PKG_VERSION:= 3.4.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_HASH:= eb0370bf223809b9ebb359fed5318f826ac038ce77933b3afd55ab1a0a21785a
PKG_DESCR:= record, convert and stream audio & video
PKG_SECTION:= libs/video
@@ -31,7 +31,7 @@ PKGSD_LIBFFMPEG:= video library
PKGSC_LIBFFMPEG:= libs/video
PKG_FLAVOURS_LIBFFMPEG:= WITH_MP3 WITH_VP8 WITH_THEORA
-PKG_FLAVOURS_LIBFFMPEG+= WITH_XVID WITH_VORBIS WITH_X264
+PKG_FLAVOURS_LIBFFMPEG+= WITH_XVID WITH_VORBIS WITH_X264 WITH_X265
PKG_FLAVOURS_LIBFFMPEG+= WITH_ZLIB WITH_BZIP2
PKGFD_WITH_BZIP2:= with bzip2 compression support
@@ -49,6 +49,13 @@ ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_X264),y)
PKG_FDEPENDS+= libx264
endif
+PKGFD_WITH_X265:= with x265 decoding support
+PKGFS_WITH_X265:= libx265
+PKGFB_WITH_X265:= libx265
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_X265),y)
+PKG_FDEPENDS+= libx265
+endif
+
PKGFD_WITH_MP3:= with mp3 encoding support
PKGFS_WITH_MP3:= libmp3lame
PKGFB_WITH_MP3:= lame
@@ -202,6 +209,9 @@ endif
ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_X264),y)
CONFIGURE_ARGS+= --enable-libx264
endif
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_X265),y)
+CONFIGURE_ARGS+= --enable-libx265
+endif
ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_MP3),y)
CONFIGURE_ARGS+= --enable-libmp3lame
endif
diff --git a/package/libx265/Makefile b/package/libx265/Makefile
new file mode 100644
index 000000000..7aeeab499
--- /dev/null
+++ b/package/libx265/Makefile
@@ -0,0 +1,32 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:= libx265
+PKG_VERSION:= 2.7
+PKG_HASH:= d5e75fa62ffe6ed49e691f8eb8ab8c1634ffcc0725dd553c6fdb4d5443b494a2
+PKG_RELEASE:= 1
+PKG_DESCR:= h265 encoding library
+PKG_SECTION:= libs/video
+PKG_URL:= http://x265.org
+PKG_SITES:= https://bitbucket.org/multicoreware/x265/downloads/
+PKG_OPTS:= dev
+
+DISTFILES:= x265_${PKG_VERSION}.tar.gz
+WRKDIST= ${WRKDIR}/x265_${PKG_VERSION}
+WRKSRC= ${WRKDIST}/source
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBX265,libx265,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIG_STYLE:= cmake
+CMAKE_FLAGS+= -DENABLE_SHARED=ON -DENABLE_PIC=ON
+
+libx265-install:
+ $(INSTALL_DIR) $(IDIR_LIBX265)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libx265*.so* \
+ $(IDIR_LIBX265)/usr/lib
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk