* sync transcode with main arch

This commit is contained in:
Alexander Baldeck 2020-09-28 13:52:04 +02:00
parent da93a4adf2
commit ccdbd9daf4
3 changed files with 104 additions and 5 deletions

View File

@ -6,26 +6,29 @@
pkgname=transcode pkgname=transcode
_sripver=0.3-4 _sripver=0.3-4
pkgver=1.1.7 pkgver=1.1.7
pkgrel=33 pkgrel=34
pkgdesc="A video/DVD ripper and encoder for the terminal/console" pkgdesc="A video/DVD ripper and encoder for the terminal/console"
arch=(powerpc64le) arch=(powerpc64le)
url="http://www.transcoding.org/" url="http://www.transcoding.org/"
license=(GPL) license=(GPL)
depends=(gawk imagemagick lzo libdvdread ffmpeg mjpegtools libmpeg2 libxaw a52dec) depends=(gawk imagemagick lzo libdvdread ffmpeg mjpegtools libmpeg2 libxaw a52dec)
makedepends=(x264 libquicktime) makedepends=(x264 libquicktime)
options=('!makeflags')
optdepends=('libquicktime: Quicktime format support') optdepends=('libquicktime: Quicktime format support')
#source=(https://bitbucket.org/france/transcode-tcforge/downloads/$pkgname-$pkgver.tar.bz2 #source=(https://bitbucket.org/france/transcode-tcforge/downloads/$pkgname-$pkgver.tar.bz2
source=(https://sources.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.bz2 source=(https://sources.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.bz2
transcode-imagemagick7.patch transcode-imagemagick7.patch
transcode-ffmpeg3.patch transcode-ffmpeg3.patch
transcode-ffmpeg4.patch transcode-ffmpeg4.patch
transcode-swresample.patch) transcode-swresample.patch
transcode-gcc10.patch
transcode-glibc-2.32.patch)
sha256sums=('1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92' sha256sums=('1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92'
'4ede15540ea6932954ac332c12dde130bf48e7e4773d1e04d3c3f23038c6ac51' '4ede15540ea6932954ac332c12dde130bf48e7e4773d1e04d3c3f23038c6ac51'
'728ec3101039d98116275e36ea5cf0434a23a0bb82aca830ea9612fb9d16b062' '728ec3101039d98116275e36ea5cf0434a23a0bb82aca830ea9612fb9d16b062'
'2cc680666f705685a9fdc54b5a377e7728765bde6ed83c43b835634e27767721' '2cc680666f705685a9fdc54b5a377e7728765bde6ed83c43b835634e27767721'
'6b4e91085742535174015be5da103fe3337b4cb14537634ae378c9050088280e') '6b4e91085742535174015be5da103fe3337b4cb14537634ae378c9050088280e'
'13ad4d06ca5b98ef66c4e0699d92023727cd7936ef1c4bf7691e3a611c6bb786'
'8f7aa89be3bc38a42fe664e8f2c0e519158cb4e55b7f99f176f1622c2718b641')
prepare() { prepare() {
cd $pkgname-$pkgver cd $pkgname-$pkgver
@ -34,13 +37,14 @@ prepare() {
patch -p1 -i ../transcode-imagemagick7.patch # Gentoo patch patch -p1 -i ../transcode-imagemagick7.patch # Gentoo patch
sed -e 's|freetype/ftglyph.h|freetype2/freetype/ftglyph.h|' -i filter/subtitler/load_font.c sed -e 's|freetype/ftglyph.h|freetype2/freetype/ftglyph.h|' -i filter/subtitler/load_font.c
patch -p1 -i ../transcode-swresample.patch # port away from avresample patch -p1 -i ../transcode-swresample.patch # port away from avresample
patch -p1 -i ../transcode-gcc10.patch # Fix build with GCC 10
patch -p1 -i ../transcode-glibc-2.32.patch # Fix build with glibc 2.32
autoreconf -vi autoreconf -vi
} }
build() { build() {
cd $pkgname-$pkgver cd $pkgname-$pkgver
CFLAGS+=" -fcommon" \
./configure --prefix=/usr --build=${CHOST} \ ./configure --prefix=/usr --build=${CHOST} \
--disable-sse --disable-sse2 --enable-altivec --disable-mmx \ --disable-sse --disable-sse2 --enable-altivec --disable-mmx \
--enable-lame --enable-ogg --enable-vorbis --enable-theora \ --enable-lame --enable-ogg --enable-vorbis --enable-theora \

View File

@ -0,0 +1,48 @@
--- a/import/demux_pass.c
+++ b/import/demux_pass.c
@@ -32,8 +32,6 @@
#include "packets.h"
-int gop, gop_pts, gop_cnt;
-
/* if you listen carefully, then you can hear the desesperate
* whisper of this code calling for a rewrite. Or for a redesign.
* Or both. -- FR
--- a/import/extract_ac3.c
+++ b/import/extract_ac3.c
@@ -334,7 +334,6 @@
FILE *fd;
#define MAX_BUF 4096
-char audio[MAX_BUF];
/* from ac3scan.c */
@@ -472,6 +471,8 @@
void extract_ac3(info_t *ipipe)
{
+ char audio[MAX_BUF];
+
int error=0;
avi_t *avifile;
--- a/import/extract_mp3.c
+++ b/import/extract_mp3.c
@@ -243,7 +243,6 @@
}
#define MAX_BUF 4096
-char audio[MAX_BUF];
/* ------------------------------------------------------------
*
@@ -258,6 +257,7 @@
void extract_mp3(info_t *ipipe)
{
+ char audio[MAX_BUF];
int error=0;

View File

@ -0,0 +1,47 @@
--- transcode-1.1.7/import/v4l/import_v4l2.c.orig 2020-08-28 08:28:44.311434934 +0000
+++ transcode-1.1.7/import/v4l/import_v4l2.c 2020-08-28 08:41:19.279323984 +0000
@@ -455,7 +455,7 @@
tc_log_warn(MOD_NAME,
"driver does not support cropping"
"(ioctl(VIDIOC_CROPCAP) returns \"%s\"), disabled",
- errno <= sys_nerr ? sys_errlist[errno] : "unknown");
+ strerror(errno));
return TC_ERROR;
}
if (verbose_flag > TC_INFO) {
@@ -485,7 +485,7 @@
tc_log_warn(MOD_NAME,
"driver does not support inquiring cropping"
" parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")",
- errno <= sys_nerr ? sys_errlist[errno] : "unknown");
+ strerror(errno));
return -1;
}
@@ -513,7 +513,7 @@
tc_log_warn(MOD_NAME,
"driver does not support inquering cropping"
" parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")",
- errno <= sys_nerr ? sys_errlist[errno] : "unknown");
+ strerror(errno));
return -1;
}
if (verbose_flag > TC_INFO) {
@@ -613,7 +613,7 @@
if (err < 0) {
if (verbose_flag) {
tc_log_warn(MOD_NAME, "driver does not support setting parameters (ioctl(VIDIOC_S_PARM) returns \"%s\")",
- errno <= sys_nerr ? sys_errlist[errno] : "unknown");
+ strerror(errno));
}
}
return TC_OK;
@@ -628,7 +628,7 @@
err = ioctl(vs->video_fd, VIDIOC_G_STD, &stdid);
if (err < 0) {
tc_log_warn(MOD_NAME, "driver does not support get std (ioctl(VIDIOC_G_STD) returns \"%s\")",
- errno <= sys_nerr ? sys_errlist[errno] : "unknown");
+ strerror(errno));
memset(&stdid, 0, sizeof(v4l2_std_id));
}