Request 2141 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 2141 (accepted)

- update to 1.9.5
- Use Qt5 on 13.2+
- Use pkgconfig for some BuildRequires

Created by olh over 8 years ago
In state accepted
Package maintainers: manfred-h and microchip8

Submit MakeMKV

Submit package home:olh:pkgconfig-ffmpeg / MakeMKV to package Multimedia / MakeMKV

makemkv.changes Changed

makemkv.spec Changed

@@ -28,22 +28,32 @@
 
 Name:           makemkv
 Summary:        DVD and BlueRay Ripping tool
-Version:        1.9.0
+Version:        1.9.5
 Release:        0.pm.1
 License:        see eula_en_linux.txt
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            http://www.makemkv.com
-Source0:        %{name}-oss-%{version}.tar.gz
-Source1:        %{name}-bin-%{version}.tar.gz
-Patch0:         %{name}-oss-%{version}.diff
+Source0:        %{name}-oss-%{version}.tar.xz
+Source1:        %{name}-bin-%{version}.tar.xz
+Patch0:         makemkv-oss-1.9.0.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       %{libnamedriveio} = %{version}-%{release}
 Requires:       %{libnamemakemkve} = %{version}-%{release}
 Requires:       %{libnamemmbd} = %{version}-%{release}
 BuildRequires:  libopenssl-devel
-BuildRequires:  libqt4-devel
 BuildRequires:  libexpat-devel
-BuildRequires:  libffmpeg-devel
+%if 0%{?suse_version} >= 1320 
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Widgets)
+%else
+BuildRequires:  pkgconfig(QtCore)
+BuildRequires:  pkgconfig(QtGui)
+BuildRequires:  pkgconfig(QtDBus)
+%endif
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  update-desktop-files
 ExclusiveArch:  i586 x86_64
 
@@ -114,7 +124,7 @@
 %install
 %makeinstall
 %suse_update_desktop_file -c makemkv makemkv "makemkv" makemkv makemkv.png AudioVideo AudioVideoEditing
-tar xzf %{SOURCE1}
+tar xaf %{SOURCE1}
 %ifarch x86_64
   %{__install} -m 755 %{name}-bin-%{version}/bin/amd64/makemkvcon %{buildroot}%{_bindir}/
 %else
@@ -123,9 +133,6 @@
 %endif
 
 
-%clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf "%{buildroot}"
-
 %post -n %{libnamedriveio} -p /sbin/ldconfig
 %postun -n %{libnamedriveio} -p /sbin/ldconfig

makemkv-bin-1.9.0.tar.gz/Makefile -> makemkv-bin-1.9.5.tar.xz/Makefile Changed

@@ -1,6 +1,7 @@
 
 ARCH=$(shell uname -m)
 DESTDIR=
+PREFIX=/usr
 
 ifeq ($(ARCH),i586)
 ARCH=i386
@@ -33,26 +34,27 @@
 	@echo accepted > $@
 
 install: tmp/eula_accepted bin/$(ARCH)/makemkvcon
-	rm -f $(DESTDIR)/usr/bin/makemkvcon
-	rm -f $(DESTDIR)/usr/bin/mmdtsdec
-	rm -f $(DESTDIR)/usr/share/MakeMKV/*.mo.gz
-	install -d $(DESTDIR)/usr/share/MakeMKV
-	install -d $(DESTDIR)/usr/bin
-	install -t $(DESTDIR)/usr/bin bin/$(ARCH)/makemkvcon
-	install -t $(DESTDIR)/usr/bin bin/i386/mmdtsdec
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/default.mmcp.xml
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/flac.mmcp.xml
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/wdtv.mmcp.xml
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/aac-stereo.mmcp.xml
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_deu.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_jpn.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_spa.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_ptb.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_dut.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_swe.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_ita.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_chi.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_pol.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_dan.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_fra.mo.gz
+	rm -f $(DESTDIR)$(PREFIX)/bin/makemkvcon
+	rm -f $(DESTDIR)$(PREFIX)/bin/mmdtsdec
+	rm -f $(DESTDIR)$(PREFIX)/share/MakeMKV/*.mo.gz
+	install -d $(DESTDIR)$(PREFIX)/share/MakeMKV
+	install -d $(DESTDIR)$(PREFIX)/bin
+	install -t $(DESTDIR)$(PREFIX)/bin bin/$(ARCH)/makemkvcon
+	install -t $(DESTDIR)$(PREFIX)/bin bin/i386/mmdtsdec
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/default.mmcp.xml
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/flac.mmcp.xml
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/wdtv.mmcp.xml
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/aac-stereo.mmcp.xml
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_deu.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_jpn.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_spa.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_ptb.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_dut.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_swe.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_nor.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_ita.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_chi.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_pol.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_dan.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_fra.mo.gz

makemkv-bin-1.9.0.tar.gz/bin/amd64/makemkvcon -> makemkv-bin-1.9.5.tar.xz/bin/amd64/makemkvcon Changed

makemkv-bin-1.9.0.tar.gz/bin/i386/makemkvcon -> makemkv-bin-1.9.5.tar.xz/bin/i386/makemkvcon Changed

makemkv-bin-1.9.0.tar.gz/bin/i386/mmdtsdec -> makemkv-bin-1.9.5.tar.xz/bin/i386/mmdtsdec Changed

makemkv-bin-1.9.0.tar.gz/src/eula_en_linux.txt -> makemkv-bin-1.9.5.tar.xz/src/eula_en_linux.txt Changed

makemkv-bin-1.9.0.tar.gz/src/share/aac-stereo.mmcp.xml -> makemkv-bin-1.9.5.tar.xz/src/share/aac-stereo.mmcp.xml Changed

makemkv-bin-1.9.0.tar.gz/src/share/default.mmcp.xml -> makemkv-bin-1.9.5.tar.xz/src/share/default.mmcp.xml Changed

makemkv-bin-1.9.0.tar.gz/src/share/flac.mmcp.xml -> makemkv-bin-1.9.5.tar.xz/src/share/flac.mmcp.xml Changed

makemkv-bin-1.9.0.tar.gz/src/share/makemkv_fra.mo.gz -> makemkv-bin-1.9.5.tar.xz/src/share/makemkv_fra.mo.gz Changed

makemkv-bin-1.9.0.tar.gz/src/share/makemkv_ita.mo.gz -> makemkv-bin-1.9.5.tar.xz/src/share/makemkv_ita.mo.gz Changed

makemkv-bin-1.9.5.tar.xz/src/share/makemkv_nor.mo.gz Added

makemkv-bin-1.9.0.tar.gz/src/share/wdtv.mmcp.xml -> makemkv-bin-1.9.5.tar.xz/src/share/wdtv.mmcp.xml Changed

makemkv-oss-1.9.0.tar.gz -> makemkv-oss-1.9.5.tar.xz Changed

Build Results
RPM Lint

Refresh

Comments for request 2141 0

Request History

olh created request over 8 years ago

- update to 1.9.5
- Use Qt5 on 13.2+
- Use pkgconfig for some BuildRequires

jobermayr accepted request over 8 years ago