Packman Build Service PMBS

transcode.spec Changed

@@ -56,8 +56,7 @@
 Summary:        A linux video stream processing utility
 Summary(de):    Das Schweizer Taschenmesser der Videobearbeitung
 License:        GPL-2.0+
-Group:          Productivity/Multimedia/Other
-Url:            https://lmgtfy.com/?q=transcode
+URL:            https://lmgtfy.com/?q=transcode
 Source:         %{name}-%{version}.tar.bz2
 Source2:        export_dvraw.c
 Patch0:         transcode-export_ffmpeg.patch
@@ -80,7 +79,6 @@
 Patch17:        transcode.patch
 BuildRequires:  libtool
 BuildRequires:  faac-devel
-BuildRequires:  glibc-devel
 BuildRequires:  imake
 %if %{with imagemagick}
 BuildRequires:  pkgconfig(MagickWand)
@@ -166,7 +164,7 @@
 test -x "$(type -p gcc)"   && export CC="$_"
 test -x "$(type -p gcc-7)" && export CC="$_"
 autoreconf -fi
-CFLAGS="%{optflags} -Werror=implicit-function-declaration -Werror=int-conversion -D_GNU_SOURCE"
+CFLAGS="%{optflags} -Wno-deprecated-declarations -Werror=implicit-function-declaration -Werror=int-conversion -D_GNU_SOURCE"
 %configure --enable-experimental \
      --enable-deprecated \
      --disable-x86-textrels \
@@ -235,7 +233,6 @@
 find docs/ -name tcindent.sh -print -exec chmod 0644 {} \;
 
 %files
-%defattr(-,root,root)
 %{_bindir}/avifix
 %{_bindir}/aviindex
 %{_bindir}/avimerge

transcode-1.1.7-libav-10.patch Changed

transcode.patch Changed

@@ -1,3 +1,136 @@
+---
+ avilib/avidump.c           |   20 ++++++++++----------
+ avilib/avilib.c            |    2 +-
+ avilib/avilib.h            |    4 ++--
+ configure.in               |    4 ----
+ export/aud_aux.c           |    2 +-
+ import/extract_ogm.c       |    5 ++++-
+ import/mpg123.h            |   35 +++++++++++++++++++++++++++++++++++
+ import/v4l/import_v4l2.c   |   15 +++++----------
+ import/v4l/import_v4lcam.c |    3 +--
+ src/framebuffer.c          |    4 ++--
+ testsuite/Makefile.am      |    2 +-
+ 11 files changed, 62 insertions(+), 34 deletions(-)
+
+--- a/avilib/avidump.c
++++ b/avilib/avidump.c
+@@ -573,7 +573,7 @@ static boolean ProcessChunk(int fd, off_
+     /* Feel free to put your extensions here! */
+ 
+     case avihtag:
+-	dump_vals(fd,sizeof(names_avih)/sizeof(struct VAL),names_avih);
++	dump_vals(fd,sizeof(names_avih)/sizeof(names_avih0),names_avih);
+ 	break;
+     case strhtag:
+     {
+@@ -581,17 +581,17 @@ static boolean ProcessChunk(int fd, off_
+ 	xio_read(fd, &fcc_type,sizeof(FOURCC));
+ 	FOURCC2Str(fcc_type,typestr);
+ 	printf("\tfcc_type     = %s\n",typestr);
+-	dump_vals(fd,sizeof(names_strh)/sizeof(struct VAL),names_strh);
++	dump_vals(fd,sizeof(names_strh)/sizeof(names_strh0),names_strh);
+ 	break;
+     }
+     case strftag:
+ 
+ 	switch (fcc_type) {
+ 	case vidstag:
+-	    dump_vals(fd,sizeof(names_strf_vids)/sizeof(struct VAL),names_strf_vids);
++	    dump_vals(fd,sizeof(names_strf_vids)/sizeof(names_strf_vids0),names_strf_vids);
+ 	    break;
+ 	case audstag:
+-	    dump_vals(fd,sizeof(names_strf_auds)/sizeof(char*),names_strf_auds);
++	    dump_vals(fd,sizeof(names_strf_auds)/sizeof(names_strf_auds0),names_strf_auds);
+ 	    break;
+ 	default:
+ 	    printf("unknown\n");
+@@ -600,16 +600,16 @@ static boolean ProcessChunk(int fd, off_
+ 	break;
+ 
+     case Tagwave:
+-	dump_vals(fd,sizeof(names_strf_auds)/sizeof(char*),names_strf_auds);
++	dump_vals(fd,sizeof(names_strf_auds)/sizeof(names_strf_auds0),names_strf_auds);
+ 	break;
+ 
+     case indxtag: {
+-	uint32_t chunks=*chunksize-sizeof(names_indx)/sizeof(char*);
++	uint32_t chunks=*chunksize-sizeof(names_indx)/sizeof(names_indx0);
+ 	loff_t offset;
+ 	uint32_t size, duration;
+ 	uint32_t u=0;
+ 	off_t indxend = datapos + chunks;
+-	dump_vals(fd,sizeof(names_indx)/sizeof(char*),names_indx);
++	dump_vals(fd,sizeof(names_indx)/sizeof(names_indx0),names_indx);
+ 
+ 	while (datapos < indxend) {
+ 	    xio_read(fd, &offset,8);
+@@ -629,11 +629,11 @@ static boolean ProcessChunk(int fd, off_
+     case Tagix01:
+     case Tagix02:
+     case Tagix03: {
+-	uint32_t chunks=*chunksize-sizeof(names_stdidx)/sizeof(char*);
++	uint32_t chunks=*chunksize-sizeof(names_stdidx)/sizeof(names_stdidx0);
+ 	uint32_t offset, size, key;
+ 	uint32_t u=0;
+ 	off_t indxend = datapos + chunks;
+-	dump_vals(fd,sizeof(names_stdidx)/sizeof(char*),names_stdidx);
++	dump_vals(fd,sizeof(names_stdidx)/sizeof(names_stdidx0),names_stdidx);
+ 
+ 	while (datapos < indxend) {
+ 	    xio_read(fd, &offset,4);
+@@ -696,7 +696,7 @@ static boolean ProcessChunk(int fd, off_
+ 	break;
+ 
+     case dmlhtag:
+-	dump_vals(fd,sizeof(names_dmlh)/sizeof(struct VAL),names_dmlh);
++	dump_vals(fd,sizeof(names_dmlh)/sizeof(names_dmlh0),names_dmlh);
+ 	break;
+     }
+ 
+--- a/avilib/avilib.c
++++ b/avilib/avilib.c
+@@ -184,7 +184,7 @@ static int avi_ixnn_entry(avi_t *AVI, av
+ {
+     int bl, k;
+     unsigned int max = ch->nEntriesInUse * sizeof(uint32_t) * ch->wLongsPerEntry + 24; // header
+-    char *ix00 = plat_malloc(max);
++    unsigned char *ix00 = plat_malloc(max);
+     char dfcc5;
+     memcpy(dfcc, ch->fcc, 4);
+     dfcc4 = 0;
+--- a/avilib/avilib.h
++++ b/avilib/avilib.h
+@@ -92,7 +92,7 @@ typedef struct _avistdindex_entry {
+ 
+ // Standard index
+ typedef struct _avistdindex_chunk {
+-    char           fcc4;                 // ix##
++    unsigned char           fcc4;                 // ix##
+     uint32_t  dwSize;                 // size of this chunk
+     uint16_t wLongsPerEntry;         // must be sizeof(aIndex0)/sizeof(DWORD)
+     uint8_t  bIndexSubType;          // must be 0
+@@ -107,7 +107,7 @@ typedef struct _avistdindex_chunk {
+ 
+ // Base Index Form 'indx'
+ typedef struct _avisuperindex_chunk {
+-    char           fcc4;
++    unsigned char           fcc4;
+     uint32_t  dwSize;                 // size of this chunk
+     uint16_t wLongsPerEntry;         // size of each entry in aIndex array (must be 8 for us)
+     uint8_t  bIndexSubType;          // future use. must be 0
+--- a/configure.in
++++ b/configure.in
+@@ -567,10 +567,6 @@ AC_CHECK_LIB(z, gzopen,
+   AC_MSG_ERROR(transcode depends on libz, but cannot links against libz),
+   )
+ 
+-AC_CHECK_LIB(m, sin,
+-  ,
+-  AC_MSG_ERROR(transcode depends on libm (>= 2.0), but cannot link against libm),
+-  -lc)
+ 
+ TC_PKG_INIT
+ 
 --- a/export/aud_aux.c
 +++ b/export/aud_aux.c
 @@ -843,7 +843,7 @@ static int tc_audio_encode_mp3(char *aud
@@ -131,3 +264,34 @@
      }
      return TC_OK;
  }
+--- a/src/framebuffer.c
++++ b/src/framebuffer.c
+@@ -1101,7 +1101,7 @@ vframe_list_t *vframe_reserve(void)
+ } while (0)
+ 
+ 
+-void aframe_push_next(aframe_list_t *ptr, int status)
++void aframe_push_next(aframe_list_t *ptr, TCFrameStatus status)
+ {
+     if (ptr == NULL) {
+         /* a bit more of paranoia */
+@@ -1123,7 +1123,7 @@ void aframe_push_next(aframe_list_t *ptr
+ }
+ 
+ 
+-void vframe_push_next(vframe_list_t *ptr, int status)
++void vframe_push_next(vframe_list_t *ptr, TCFrameStatus status)
+ {
+     if (ptr == NULL) {
+         /* a bit more of paranoia */
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -56,7 +56,7 @@ test_framealloc_SOURCES = test-frameallo
+ test_framealloc_LDADD = $(LIBTC_LIBS)
+ 
+ test_framecode_SOURCES = test-framecode.c
+-test_framecode_LDADD = $(LIBTC_LIBS)
++test_framecode_LDADD = $(LIBTC_LIBS) -lm
+ 
+ test_imgconvert_SOURCES = test-imgconvert.c
+ test_imgconvert_LDADD = $(ACLIB_LIBS)

Changes of Revision 29