Browse Source

remove mplayer and libxvidcore, fix vlc compile

Waldemar Brodkorb 1 week ago
parent
commit
6e6ef91cf0

+ 1 - 11
package/ffmpeg/Makefile

@@ -37,7 +37,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 WITH_X265
+PKG_FLAVOURS_LIBFFMPEG+=	WITH_VORBIS WITH_X264 WITH_X265
 PKG_FLAVOURS_LIBFFMPEG+=	WITH_ZLIB WITH_BZIP2
 
 PKGFD_WITH_BZIP2:=	with bzip2 compression support
@@ -83,13 +83,6 @@ ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_THEORA),y)
 PKG_FDEPENDS+=		libtheora
 endif
 
-PKGFD_WITH_XVID:=	with xvid encoding support
-PKGFS_WITH_XVID:=	libxvid
-PKGFB_WITH_XVID:=	xvidcore
-ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_XVID),y)
-PKG_FDEPENDS+=		libxvid
-endif
-
 PKGFD_WITH_VORBIS:=	with vorbis encoding support
 PKGFS_WITH_VORBIS:=	libvorbisenc
 PKGFB_WITH_VORBIS:=	libvorbis
@@ -235,9 +228,6 @@ endif
 ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_THEORA),y)
 CONFIGURE_ARGS+=	--enable-libtheora
 endif
-ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_XVID),y)
-CONFIGURE_ARGS+=	--enable-libxvid
-endif
 ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS),y)
 CONFIGURE_ARGS+=	--enable-libvorbis \
 			--enable-muxer=ogg \

+ 2 - 2
package/kodi/Makefile

@@ -15,7 +15,7 @@ PKG_DEPENDS+=		libflac libbz2 libtiff libnettle librtmp liblzo libXext
 PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libncurses libpng
 PKG_DEPENDS+=		libpcre2 libcdio libfreetype libsamplerate libuuid
 PKG_DEPENDS+=		taglib libjasper libmp3lame libgpg-error giflib nghttp2
-PKG_DEPENDS+=		glib libdcadec libffmpeg libxvidcore harfbuzz exiv2
+PKG_DEPENDS+=		glib libdcadec libffmpeg harfbuzz exiv2
 PKG_DEPENDS+=		flatbuffers fstrcmp spdlog mesa libinput libxkbcommon
 PKG_DEPENDS+=		xkeyboard-config tinyxml2 libdisplay-info libudfread json
 PKG_BUILDDEP:=		python3 libass ffmpeg rtmpdump libudfread exiv2
@@ -23,7 +23,7 @@ PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo fmt rapidjson
 PKG_BUILDDEP+=		curl flac bzip2 libtiff yajl cmake-host libdisplay-info
 PKG_BUILDDEP+=		tinyxml tinyxml2 sqlite pcre2 libcdio freetype libpng
 PKG_BUILDDEP+=		libsamplerate taglib libjasper giflib xkeyboard-config
-PKG_BUILDDEP+=		glib libmodplug libgpg-error xvidcore libxshmfence
+PKG_BUILDDEP+=		glib libmodplug libgpg-error libxshmfence
 PKG_BUILDDEP+=		swig-host liblzo-host libpng-host libjpeg-turbo-host
 PKG_BUILDDEP+=		zip-host unzip-host giflib-host libsquish libdcadec
 PKG_BUILDDEP+=		openssl bzip2 liblzo harfbuzz pcre json

+ 1 - 4
package/lame/Makefile

@@ -27,10 +27,7 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBMP3LAME,libmp3lame,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBMP3LAME},${PKGSC_LIBMP3LAME},${PKG_OPTS}))
 
-TARGET_LDFLAGS+=	-ltinfo
-ifeq ($(ADK_TARGET_ARCH_X86),y)
-TARGET_CFLAGS+=		-msse
-endif
+TARGET_LDFLAGS+=	-ltinfow
 
 lame-install:
 	$(INSTALL_DIR) $(IDIR_LAME)/usr/bin

+ 0 - 194
package/mplayer/Makefile

@@ -1,194 +0,0 @@
-# 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:=		mplayer
-PKG_VERSION:=		1.5
-PKG_RELEASE:=		1
-PKG_HASH:=		650cd55bb3cb44c9b39ce36dac488428559799c5f18d16d98edb2b7256cbbf85
-PKG_DESCR:=		popular video player
-PKG_SECTION:=		mm/video
-PKG_DEPENDS:=		alsa-lib libjpeg-turbo libfaad2 libmad libncurses
-PKG_DEPENDS+=		libogg libpng libvorbis giflib
-PKG_DEPENDS+=		libx11 libxau libxdmcp libxext libxv zlib
-PKG_DEPENDS+=		libxscrnsaver libtheora libxvid libvpx
-PKG_BUILDDEP:=		alsa-lib libmad libvorbis faad2 ncurses zlib
-PKG_BUILDDEP+=		libX11 libXv libpng libXext libjpeg-turbo libtheora
-PKG_BUILDDEP+=		xvidcore libvpx
-PKG_NEEDS:=		threads intl
-PKG_URL:=		http://www.mplayerhq.hu/
-PKG_SITES:=		http://www.mplayerhq.hu/MPlayer/releases/
-
-DISTFILES:=		MPlayer-$(PKG_VERSION).tar.xz
-WRKDIST=		${WRKDIR}/MPlayer-${PKG_VERSION}
-
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips arm aarch64
-
-PKG_FLAVOURS_MPLAYER:=	WITH_DIRECTFB
-PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
-PKGFS_WITH_DIRECTFB:=	directfb
-PKGFB_WITH_DIRECTFB:=	DirectFB
-
-
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,MPLAYER,mplayer,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-TARGET_CC:=		${TARGET_COMPILER_PREFIX}gcc
-TARGET_CFLAGS+=		-D_POSIX_SOURCE -D_GNU_SOURCE
-
-CONFIG_STYLE:=		minimal
-FAKE_FLAGS+=		INSTALLSTRIP=''
-
-ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
-EXTRA_CFLAGS:=		-DARCH_MIPS64
-endif
-
-# Somehow this include path is missing here, although other
-# applications build fine against DirectFB. There is also a
-# related patch to allow configure to find out the DirectFB
-# version number.
-ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y)
-TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/directfb
-endif
-
-ifeq (${ADK_TARGET_CPU_WITH_MMX},y)
-CONFIGURE_CPU_OPTS:=	--enable-mmx
-else
-CONFIGURE_CPU_OPTS:=	--disable-mmx
-endif
-ifeq (${ADK_TARGET_CPU_WITH_MMXEXT},y)
-CONFIGURE_CPU_OPTS+=	--enable-mmxext
-else
-CONFIGURE_CPU_OPTS+=	--disable-mmxext
-endif
-ifeq (${ADK_TARGET_CPU_WITH_3DNOW},y)
-CONFIGURE_CPU_OPTS:=	--enable-3dnow
-else
-CONFIGURE_CPU_OPTS:=	--disable-3dnow
-endif
-ifeq (${ADK_TARGET_CPU_WITH_SSE4_2},y)
-CONFIGURE_CPU_OPTS+=    --enable-sse42 \
-			--disable-sse4 \
-			--disable-ssse3 \
-			--disable-sse3 \
-			--disable-sse2 \
-			--disable-sse
-else
-CONFIGURE_CPU_OPTS+=    --disable-sse42
-ifeq (${ADK_TARGET_CPU_WITH_SSE4_1},y)
-CONFIGURE_CPU_OPTS+=    --enable-sse4 \
-			--disable-ssse3 \
-			--disable-sse3 \
-			--disable-sse2 \
-			--disable-sse
-else
-CONFIGURE_CPU_OPTS+=    --disable-sse4
-ifeq (${ADK_TARGET_CPU_WITH_SSSE3},y)
-CONFIGURE_CPU_OPTS+=    --enable-ssse3 \
-			--disable-sse3 \
-			--disable-sse2 \
-			--disable-sse
-else
-CONFIGURE_CPU_OPTS+=    --disable-ssse3
-ifeq (${ADK_TARGET_CPU_WITH_SSE3},y)
-CONFIGURE_CPU_OPTS+=    --enable-sse3 \
-			--disable-sse2 \
-			--disable-sse
-else
-CONFIGURE_CPU_OPTS+=    --disable-sse3
-ifeq (${ADK_TARGET_CPU_WITH_SSE2},y)
-CONFIGURE_CPU_OPTS+=    --enable-sse2 \
-			--disable-sse
-else
-CONFIGURE_CPU_OPTS+=    --disable-sse2
-ifeq (${ADK_TARGET_CPU_WITH_SSE},y)
-CONFIGURE_CPU_OPTS+=    --enable-sse
-else
-CONFIGURE_CPU_OPTS+=    --disable-sse
-endif
-endif
-endif
-endif
-endif
-endif
-#ifeq (${ADK_TARGET_CPU_WITH_IWMMXT},y)
-#CONFIGURE_CPU_OPTS+=	--enable-iwmmxt
-#else
-#CONFIGURE_CPU_OPTS+=	--disable-iwmmxt
-#endif
-
-ifeq ($(ADK_DEBUG),y)
-CONFIGURE_DEBUG=	--enable-debug
-endif
-
-ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y)
-CONFIGURE_DIRECTFB=	--enable-directfb
-else
-CONFIGURE_DIRECTFB=	--disable-directfb
-endif
-
-CONFIGURE_ARGS:=	--prefix=/usr \
-			--enable-x11 \
-			--confdir=/etc \
-			--enable-cross-compile \
-			--target=${ADK_TARGET_ARCH}-linux \
-			--cc='$(TARGET_CC)' \
-			--host-cc=$(CC_FOR_BUILD) \
-			--enable-fbdev \
-			--enable-alsa \
-			--enable-tv \
-			--enable-v4l2 \
-			--enable-png \
-			--enable-jpeg \
-			--enable-mad \
-			--enable-libvorbis \
-			--enable-faac \
-			--enable-theora \
-			--enable-xvid \
-			--enable-x264 \
-			--enable-x264-lavc \
-			--disable-mencoder \
-			--disable-ossaudio \
-			--disable-caca \
-			--disable-vm \
-			--disable-iconv \
-			--disable-lirc \
-			--disable-radio-v4l2 \
-			--disable-speex \
-			--disable-libdv \
-			--disable-live \
-			--disable-pvr \
-			--disable-ftp \
-			--disable-freetype \
-			--disable-mpg123 \
-			--disable-arts \
-			--disable-esd \
-			--disable-jack \
-			--disable-openal \
-			--disable-nas \
-			--disable-sgiaudio \
-			--disable-sunaudio \
-			--disable-win32waveout \
-			--disable-tga \
-			--disable-pnm \
-			--disable-md5sum \
-			--disable-liblzo \
-			--disable-sdl \
-			--disable-xinerama \
-			--disable-vidix \
-			--disable-gl \
-			--extra-cflags="${EXTRA_CFLAGS}" \
-			${CONFIGURE_CPU_OPTS} \
-			${CONFIGURE_DEBUG} \
-			${CONFIGURE_DIRECTFB}
-
-XAKE_FLAGS+=		AR="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib"
-TARGET_LDFLAGS+=	-lxvidcore -lX11 -lXext -lvorbis
-
-mplayer-install:
-	${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin
-	${CP} ${WRKINST}/usr/bin/mplayer ${IDIR_MPLAYER}/usr/bin
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 0 - 14
package/mplayer/patches/patch-libao2_ao_alsa_c

@@ -1,14 +0,0 @@
---- MPlayer-1.1.1.orig/libao2/ao_alsa.c	2012-04-10 15:17:49.000000000 +0200
-+++ MPlayer-1.1.1/libao2/ao_alsa.c	2013-11-14 13:20:30.000000000 +0100
-@@ -756,8 +756,9 @@ static int play(void* data, int len, int
- {
-   int num_frames;
-   snd_pcm_sframes_t res = 0;
--  if (!(flags & AOPLAY_FINAL_CHUNK))
--      len = len / ao_data.outburst * ao_data.outburst;
-+  // SIGFPE on Sharp Zaurus ARM CPU
-+  //if (!(flags & AOPLAY_FINAL_CHUNK))
-+  //    len = len / ao_data.outburst * ao_data.outburst;
-   num_frames = len / bytes_per_sample;
- 
-   //mp_msg(MSGT_AO,MSGL_ERR,"alsa-play: frames=%i, len=%i\n",num_frames,len);

+ 0 - 11
package/mplayer/patches/patch-libvo_vo_dga_c

@@ -1,11 +0,0 @@
---- mplayer-1.0-32749.orig/libvo/vo_dga.c	2011-01-03 11:26:57.000000000 +0100
-+++ mplayer-1.0-32749/libvo/vo_dga.c	2011-01-03 11:44:50.000000000 +0100
-@@ -35,7 +35,7 @@
- #include "mp_msg.h"
- 
- #include <X11/Xlib.h>
--#include <X11/extensions/xf86dga.h>
-+#include <X11/extensions/Xxf86dga.h>
- 
- #ifdef CONFIG_XF86VM
- #include <X11/extensions/xf86vmode.h>

+ 0 - 11
package/mplayer/patches/patch-loader_ldt_keeper_c

@@ -1,11 +0,0 @@
---- MPlayer-1.1.1.orig/loader/ldt_keeper.c	2011-05-24 21:51:38.000000000 +0200
-+++ MPlayer-1.1.1/loader/ldt_keeper.c	2013-11-14 13:24:09.000000000 +0100
-@@ -210,7 +210,7 @@ ldt_fs_t* Setup_LDT_Keeper(void)
-     array.seg_not_present=0;
-     array.contents=MODIFY_LDT_CONTENTS_DATA;
-     array.limit_in_pages=0;
--#ifdef __linux__
-+#if defined(__linux__) && (__GLIBC__)
-     //ret=LDT_Modify(0x1, &array, sizeof(struct modify_ldt_ldt_s));
-     ret=modify_ldt(0x1, &array, sizeof(struct modify_ldt_ldt_s));
-     if(ret<0)

+ 0 - 23
package/mplayer/patches/patch-stream_asf_mmst_streaming_c

@@ -1,23 +0,0 @@
---- mplayer-1.0-32749.orig/stream/asf_mmst_streaming.c	2011-01-03 11:26:52.000000000 +0100
-+++ mplayer-1.0-32749/stream/asf_mmst_streaming.c	2011-07-29 17:29:01.494032168 +0200
-@@ -359,20 +359,7 @@ static int interp_header (uint8_t *heade
-       }
- 
-     } else {
--#if 0
--      int b = i;
--      printf ("unknown object (guid: %016llx, %016llx, len: %lld)\n", guid_1, guid_2, length);
--      for (; b < length; b++)
--      {
--        if (isascii(header[b]) || isalpha(header[b]))
--	    printf("%c ", header[b]);
--	else
--    	    printf("%x ", header[b]);
--      }
--      printf("\n");
--#else
-       mp_msg(MSGT_NETWORK,MSGL_WARN,MSGTR_MPDEMUX_MMST_UnknownObject);
--#endif
-     }
- 
- //    mp_msg(MSGT_NETWORK,MSGL_INFO,"length    : %lld\n", length);

+ 9 - 1
package/vlc/Makefile

@@ -16,7 +16,7 @@ PKG_URL:=		http://www.videolan.org/vlc/
 PKG_SITES:=		http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/
 
 PKG_FLAVOURS_VLC:=	WITH_BLURAY WITH_MAD WITH_OGG WITH_OPUS WITH_SPEEX WITH_THEORA
-PKG_FLAVOURS_VLC+=	WITH_VPX WITH_X264
+PKG_FLAVOURS_VLC+=	WITH_VPX WITH_X264 WITH_X265
 PKGFD_WITH_BLURAY:=	enable bluray support
 PKGFB_WITH_BLURAY:=	libbluray
 PKGFS_WITH_BLURAY:=	libbluray
@@ -41,6 +41,9 @@ PKGFS_WITH_VPX:=	libvpx
 PKGFD_WITH_X264:=	enable h264 support
 PKGFB_WITH_X264:=	libx264
 PKGFS_WITH_X264:=	libx264
+PKGFD_WITH_X265:=	enable h265 support
+PKGFB_WITH_X265:=	libx265
+PKGFS_WITH_X265:=	libx265
 
 include $(ADK_TOPDIR)/mk/package.mk
 
@@ -115,6 +118,11 @@ CONFIGURE_ARGS+=	--enable-x264
 else
 CONFIGURE_ARGS+=	--disable-x264
 endif
+ifneq ($(ADK_PACKAGE_VLC_WITH_X265),)
+CONFIGURE_ARGS+=	--enable-x265
+else
+CONFIGURE_ARGS+=	--disable-x265
+endif
 
 vlc-install:
 	$(INSTALL_DIR) $(IDIR_VLC)/usr/bin

+ 10 - 0
package/vlc/patches/patch-include_vlc_libvlc_media_h

@@ -0,0 +1,10 @@
+--- vlc-3.0.23.orig/include/vlc/libvlc_media.h	2025-12-23 11:49:20.000000000 +0100
++++ vlc-3.0.23/include/vlc/libvlc_media.h	2026-02-23 06:49:59.350283178 +0100
+@@ -35,6 +35,7 @@ extern "C" {
+ typedef SSIZE_T ssize_t;
+ #endif
+ 
++#include <sys/types.h>
+ 
+ /** \defgroup libvlc_media LibVLC media
+  * \ingroup libvlc

+ 0 - 5
package/vlc/patches/patch-src_revision_c

@@ -1,5 +0,0 @@
---- vlc-3.0.23.orig/src/revision.c	2025-12-23 12:00:14.000000000 +0100
-+++ vlc-3.0.23/src/revision.c	2026-02-22 21:10:50.152907982 +0100
-@@ -1 +1 @@
--const char psz_vlc_changeset[] = "3.0.23-2-0-g79128878dd";
-+const char psz_vlc_changeset[] = "bf934e746";

+ 0 - 5
package/vlc/patches/patch-src_revision_txt

@@ -1,5 +0,0 @@
---- vlc-3.0.23.orig/src/revision.txt	2025-12-23 12:00:14.000000000 +0100
-+++ vlc-3.0.23/src/revision.txt	2026-02-22 21:10:50.136908017 +0100
-@@ -1 +1 @@
--3.0.23-2-0-g79128878dd
-+bf934e746

+ 0 - 30
package/xvidcore/Makefile

@@ -1,30 +0,0 @@
-# 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:=		xvidcore
-PKG_VERSION:=		1.3.7
-PKG_RELEASE:=		1
-PKG_HASH:=		abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d
-PKG_DESCR:=		xvid codec library
-PKG_SECTION:=		libs/video
-PKG_URL:=		http://www.xvid.org/
-PKG_SITES:=		http://downloads.xvid.org/downloads/
-PKG_LIBNAME:=		libxvid
-PKG_OPTS:=		dev
-
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-WRKDIST=		$(WRKDIR)/$(PKG_NAME)/build/generic
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LIBXVID,libxvid,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-libxvid-install:
-	$(INSTALL_DIR) $(IDIR_LIBXVID)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libxvidcore.so* \
-		$(IDIR_LIBXVID)/usr/lib
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk