diff --git a/extra/xine-lib/.SRCINFO b/extra/xine-lib/.SRCINFO index 8dc8186dc..e69ce6bc8 100644 --- a/extra/xine-lib/.SRCINFO +++ b/extra/xine-lib/.SRCINFO @@ -1,11 +1,12 @@ pkgbase = xine-lib pkgdesc = Multimedia playback engine pkgver = 1.2.13 - pkgrel = 6 + pkgrel = 7 url = https://www.xine-project.org arch = x86_64 - license = GPL - license = LGPL + license = GPL-2.0-or-later + license = LGPL-2.0-or-later + makedepends = mercurial makedepends = mesa makedepends = libdvdnav makedepends = libdvdread @@ -19,6 +20,7 @@ pkgbase = xine-lib makedepends = flac makedepends = libdca makedepends = libmad + makedepends = libmodplug makedepends = libmpcdec makedepends = wavpack makedepends = gdk-pixbuf2 @@ -26,11 +28,10 @@ pkgbase = xine-lib makedepends = libcaca makedepends = libmng makedepends = libnfs + makedepends = libnsl makedepends = smbclient depends = ffmpeg depends = libjpeg-turbo - depends = libmodplug - depends = libnsl depends = libpng depends = libx11 depends = libxcb @@ -61,7 +62,7 @@ pkgbase = xine-lib optdepends = libnfs: for nfs plugin optdepends = libssh2: for ssh plugin optdepends = smbclient: for samba plugin - source = https://downloads.sourceforge.net/project/xine/xine-lib/1.2.13/xine-lib-1.2.13.tar.xz - sha256sums = 5f10d6d718a4a51c17ed1b32b031d4f9b80b061e8276535b2be31e5ac4b75e6f + source = hg+http://hg.code.sf.net/p/xine/xine-lib-1.2#tag=1.2.13 + sha256sums = 9d1e3951d945507e960aae670079036e468ac766321dfa481bc106d19ac777d9 pkgname = xine-lib diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 871f83b56..b76118bd9 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -6,13 +6,13 @@ pkgname=xine-lib pkgver=1.2.13 -pkgrel=6 +pkgrel=7 pkgdesc='Multimedia playback engine' arch=('x86_64') url='https://www.xine-project.org' -license=('GPL' 'LGPL') -depends=('ffmpeg' 'libjpeg-turbo' 'libmodplug' 'libnsl' 'libpng' 'libx11' 'libxcb' - 'libxext' 'libxinerama' 'libxv' 'libxvmc' 'zlib') +license=('GPL-2.0-or-later' 'LGPL-2.0-or-later') +depends=('ffmpeg' 'libjpeg-turbo' 'libpng' 'libx11' 'libxcb' 'libxext' + 'libxinerama' 'libxv' 'libxvmc' 'zlib') optdepends=('libdvdnav: for dvd plugin' 'libdvdread: for spu and dxr3 plugins' 'vcdimager: for vcd plugin' @@ -35,15 +35,29 @@ optdepends=('libdvdnav: for dvd plugin' 'libnfs: for nfs plugin' 'libssh2: for ssh plugin' 'smbclient: for samba plugin') -makedepends=('mesa' 'libdvdnav' 'libdvdread' 'vcdimager' 'glu' 'sdl' +makedepends=('mercurial' 'mesa' 'libdvdnav' 'libdvdread' 'vcdimager' 'glu' 'sdl' 'wayland' 'aalib' 'a52dec' 'faad2' 'flac' 'libdca' 'libmad' - 'libmpcdec' 'wavpack' 'gdk-pixbuf2' 'imagemagick' 'libcaca' - 'libmng' 'libnfs' 'smbclient') -source=("https://downloads.sourceforge.net/project/xine/xine-lib/${pkgver}/xine-lib-${pkgver}.tar.xz") -sha256sums=('5f10d6d718a4a51c17ed1b32b031d4f9b80b061e8276535b2be31e5ac4b75e6f') + 'libmodplug' 'libmpcdec' 'wavpack' 'gdk-pixbuf2' 'imagemagick' + 'libcaca' 'libmng' 'libnfs' 'libnsl' 'smbclient') +source=("hg+http://hg.code.sf.net/p/xine/xine-lib-${pkgver%.*}#tag=${pkgver}") +sha256sums=('9d1e3951d945507e960aae670079036e468ac766321dfa481bc106d19ac777d9') + +prepare() { + # ffmpeg 7.0 support + hg --cwd "xine-lib-${pkgver%.*}" graft --rev 771f4ae27e582123ff3500444718fc8f96186d74 + hg --cwd "xine-lib-${pkgver%.*}" graft --rev 0a786d63bbdb2d780a9231f6772e84e743c72014 + hg --cwd "xine-lib-${pkgver%.*}" graft --rev 6f1000084f6084f49c95c202d12593e49916f58b + hg --cwd "xine-lib-${pkgver%.*}" graft --rev 1e7b184008860c8be2289c3cefd9dee57f06193a + hg --cwd "xine-lib-${pkgver%.*}" graft --rev 73b833e7fe356cd2d9490dda4ebc9bfe16fce958 + + autoreconf -fi "xine-lib-${pkgver%.*}" +} build() { - cd "${pkgname}-${pkgver}" + # workaround for detecting xvmc with gcc 14 + export CFLAGS+=' -Wno-implicit-function-declaration' + + cd "xine-lib-${pkgver%.*}" ./configure \ --prefix='/usr' \ --enable-antialiasing \ @@ -55,5 +69,5 @@ build() { } package() { - make -C "${pkgname}-${pkgver}" DESTDIR="$pkgdir" install + make -C "xine-lib-${pkgver%.*}" DESTDIR="$pkgdir" install }