Packman Build Service PMBS

Difference Between Revision 12 and Multimedia / handbrake

handbrake.spec Changed

@@ -23,15 +23,15 @@
 
 Name:           handbrake
 Summary:        Multithreaded Video Transcoder
-Version:        1.5.1
+Version:        1.7.2
 Release:        0
 Url:            http://handbrake.fr/
 Source0:        https://github.com/HandBrake/HandBrake/releases/download/%{version}/HandBrake-%{version}-source.tar.bz2
 Source1:        https://github.com/HandBrake/HandBrake/releases/download/%{version}/HandBrake-%{version}-source.tar.bz2.sig
 Patch0:         HandBrake-no-builddate.patch
 Patch1:         HandBrake-build-shared.patch
-Patch2:         HandBrake-metainfo.patch
-Patch3:         HandBrake-end-of-non-void-function.patch
+##Patch2:         HandBrake-metainfo.patch
+##Patch3:         HandBrake-end-of-non-void-function.patch
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 BuildRequires:  autoconf
@@ -66,21 +66,22 @@
 BuildRequires:  pkgconfig(jansson)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libass)
-BuildRequires:  pkgconfig(libavcodec) >= 58
-BuildRequires:  pkgconfig(libavfilter) >= 7
-BuildRequires:  pkgconfig(libavformat) >= 58
-BuildRequires:  pkgconfig(libavresample) >= 4
-BuildRequires:  pkgconfig(libavutil) >= 56
+BuildRequires:  ffmpeg-6-libavcodec-devel
+BuildRequires:  ffmpeg-6-libavfilter-devel
+BuildRequires:  ffmpeg-6-libavformat-devel
+BuildRequires:  ffmpeg-6-libswresample-devel
+BuildRequires:  ffmpeg-6-libavutil-devel
 BuildRequires:  pkgconfig(libbluray) >= 1.0.2
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libmpeg2)
-BuildRequires:  pkgconfig(libswscale) >= 5
+BuildRequires:  ffmpeg-6-libswscale-devel
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(opus)
 BuildRequires:  pkgconfig(samplerate)
 BuildRequires:  pkgconfig(speex)
+BuildRequires:  pkgconfig(SvtAv1Enc)
 BuildRequires:  pkgconfig(theora)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vpx) >= 1.4
@@ -130,10 +131,11 @@
 %setup -q -n HandBrake-%{version}
 %patch0 -p0
 %patch1 -p0
-%if 0%{?sle_version} == 150200 && 0%{?is_opensuse}
-%patch2 -p1
-%endif
-%patch3 -p0
+##%if 0%{?sle_version} == 150200 && 0%{?is_opensuse}
+##%patch2 -p1
+##%endif
+##%patch3 -p0
+find . -type f -exec sed -i -e 's|AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT|AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT|g' {} \;
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused -I%{_includedir}/ffmpeg"

HandBrake-build-shared.patch Changed

@@ -1,12 +1,13 @@
---- make/include/main.defs.orig	2021-07-19 09:51:29.420769173 +0200
-+++ make/include/main.defs	2021-07-19 09:51:29.436768899 +0200
-@@ -29,35 +29,23 @@
+--- make/include/main.defs.orig	2024-01-03 14:19:18.317044865 +0100
++++ make/include/main.defs	2024-01-03 14:18:04.937263704 +0100
+@@ -30,37 +30,25 @@
      MODULES += contrib/jansson
      MODULES += contrib/libvpx
      MODULES += contrib/libjpeg-turbo
 -endif
 -
 -ifeq (1,$(FEATURE.flatpak))
+-    MODULES += contrib/libass
 -    MODULES += contrib/jansson
 -    MODULES += contrib/x264
 -endif
@@ -23,6 +24,7 @@
 -endif
 -
 -MODULES += contrib/libdav1d
+-MODULES += contrib/svt-av1
 -MODULES += contrib/zimg
 -MODULES += contrib/ffmpeg
 -MODULES += contrib/libdvdread
@@ -32,6 +34,7 @@
 -ifeq (1,$(FEATURE.qsv))
 -ifeq (,$(filter $(HOST.system),freebsd))
 +    MODULES += contrib/libdav1d
++    MODULES += contrib/svt-av1
 +    MODULES += contrib/zimg
 +    MODULES += contrib/ffmpeg
 +    MODULES += contrib/libdvdread
@@ -42,30 +45,38 @@
  endif
 +
 +ifeq (1,$(FEATURE.flatpak))
++    MODULES += contrib/libass
 +    MODULES += contrib/jansson
 +    MODULES += contrib/x264
  endif
  
  ifeq (1,$(FEATURE.vce))
---- gtk/configure.ac.orig	2021-07-19 09:51:32.612714687 +0200
-+++ gtk/configure.ac	2021-07-19 09:51:32.628714415 +0200
-@@ -203,7 +203,7 @@
- 
- AM_CONDITIONAL(MINGW, test "x$mingw_flag" = "xyes")
- 
--HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -lturbojpeg -llzma -lzimg"
-+HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -lturbojpeg -llzma -lzimg -ldl"
- HB_CPPFLAGS="$HB_CPPFLAGS $HBINC"
- 
- PKG_CHECK_MODULES(x264, x264, sys_x264=yes, sys_x264=no)
---- test/module.defs.orig	2021-07-19 09:51:36.392650171 +0200
-+++ test/module.defs	2021-07-19 09:51:36.408649898 +0200
+--- gtk/meson.build.orig	2024-01-03 14:26:21.795977241 +0100
++++ gtk/meson.build	2024-01-03 14:26:21.803977224 +0100
+@@ -47,6 +47,7 @@
+   dependency('libavformat'),
+   dependency('libavutil'),
+   dependency('libbluray'),
++  dependency('ldl'),
+   dependency('liblzma'),
+   dependency('libpostproc'),
+   dependency('libswresample'),
+@@ -63,6 +64,7 @@
+   dependency('vorbisenc'),
+   dependency('vpx'),
+   dependency('x264'),
++  dependency('x265'),
+   dependency('zimg'),
+   dependency('zlib'),
+ 
+--- test/module.defs.orig	2024-01-03 14:28:05.407769523 +0100
++++ test/module.defs	2024-01-03 14:28:05.415769508 +0100
 @@ -16,7 +16,7 @@
  TEST.GCC.l = \
          ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
          dvdread fribidi swscale vpx theoraenc theoradec vorbis vorbisenc ogg \
 -        x264 bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d \
 +        x264 x265 bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d \
-         turbojpeg zimg
+         turbojpeg zimg SvtAv1Enc
  
  ifeq (,$(filter $(HOST.system),darwin cygwin mingw))

HandBrake-no-builddate.patch Changed

@@ -1,6 +1,6 @@
---- make/configure.py.orig	2021-07-19 10:50:19.658064229 +0200
-+++ make/configure.py	2021-07-19 10:50:19.690063654 +0200
-@@ -989,7 +989,7 @@
+--- make/configure.py.orig	2024-01-03 14:47:23.313901693 +0100
++++ make/configure.py	2024-01-03 14:47:23.321901684 +0100
+@@ -984,7 +984,7 @@
  
              url_ctype = '_unstable'
              url_ntype = 'unstable'
@@ -8,8 +8,8 @@
 +            self.build = '@BUILD@' + '01'
              self.title = '%s %s (%s)' % (self.name,self.version,self.build)
          else:
-             m = re.match('^(a-zA-Z+)\.(0-9+)$', self.suffix)
-@@ -1008,7 +1008,7 @@
+             m = re.match(r'^(a-zA-Z+)\.(0-9+)$', self.suffix)
+@@ -1003,7 +1003,7 @@
                  url_ctype = '_unstable'
                  url_ntype = 'unstable'
  
@@ -18,7 +18,7 @@
              self.title = '%s %s (%s)' % (self.name,self.version,self.build)
  
          self.url_appcast = 'https://handbrake.fr/appcast%s%s.xml' % (url_ctype,url_arch)
-@@ -1950,7 +1950,6 @@
+@@ -1991,7 +1991,6 @@
  
      ## create document object
      doc = ConfigDocument()
@@ -26,7 +26,7 @@
  
      ## add configure line for reconfigure purposes
      doc.addBlank()
-@@ -2007,7 +2006,6 @@
+@@ -2048,7 +2047,6 @@
      doc.add( 'BUILD.title',   '%s %s' % (build_tuple.systemf,arch.mode.default) )
      doc.add( 'BUILD.ncpu',    core.count )
      doc.add( 'BUILD.jobs',    core.jobs )

HandBrake-1.5.1-source.tar.bz2 Deleted

HandBrake-1.7.2-source.tar.bz2 Added

HandBrake-1.5.1-source.tar.bz2.sig -> HandBrake-1.7.2-source.tar.bz2.sig Changed