From d77af60f35259a4a8c385ed260e822b4ee72877ce284d9903b4d5d3a9e0e6451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 21 Aug 2017 12:31:19 +0000 Subject: [PATCH 1/2] - Build only against luajit and not lua where possible - Comment on why we depend on lua (for bash_completion generating) OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=107 --- mpv.changes | 7 +++++++ mpv.spec | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/mpv.changes b/mpv.changes index ffbbe16..6fd2bd0 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 21 12:31:39 UTC 2017 - tchvatal@suse.com + +- Build only against luajit and not lua where possible +- Comment on why we depend on lua (for bash_completion generating) + ------------------------------------------------------------------- Sun Aug 20 12:17:49 UTC 2017 - aloisio@gmx.com @@ -129,6 +135,7 @@ Tue Jul 18 19:42:17 UTC 2017 - 9@cirno.systems * ytdl_hook: treat single-entry playlists as a single video ------------------------------------------------------------------- +>>>>>>> ./mpv.changes.rcf94f24b222293c0f1dd5c61baca88f4 Mon May 22 08:41:28 UTC 2017 - tchvatal@suse.com - Depend on lua-5.1 as 5.3 is incompatible wrt bsc#1040034 diff --git a/mpv.spec b/mpv.spec index e7e830b..68a0020 100644 --- a/mpv.spec +++ b/mpv.spec @@ -41,6 +41,7 @@ BuildRequires: bash BuildRequires: hicolor-icon-theme BuildRequires: libjpeg-devel BuildRequires: linux-kernel-headers +# Needed any lua to convert the bash-completion BuildRequires: lua BuildRequires: perl BuildRequires: pkgconfig @@ -105,7 +106,11 @@ BuildRequires: pkgconfig(lua) %if 0%{?suse_version} > 1320 %ifarch aarch64 %{ix86} x86_64 BuildRequires: pkgconfig(luajit) +%else +BuildRequires: pkgconfig(lua-5.1) %endif +%else +BuildRequires: pkgconfig(lua-5.1) %endif %if 0%{?suse_version} >= 1315 # Testing framework: disabled for now as it runs just 1 test From ad23773f4d010ce20864007a6b6c151956cdfcb86237c9006e43a6df57faa9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 21 Aug 2017 13:15:40 +0000 Subject: [PATCH 2/2] - OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=108 --- mpv.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/mpv.changes b/mpv.changes index 6fd2bd0..0fe8f55 100644 --- a/mpv.changes +++ b/mpv.changes @@ -135,7 +135,6 @@ Tue Jul 18 19:42:17 UTC 2017 - 9@cirno.systems * ytdl_hook: treat single-entry playlists as a single video ------------------------------------------------------------------- ->>>>>>> ./mpv.changes.rcf94f24b222293c0f1dd5c61baca88f4 Mon May 22 08:41:28 UTC 2017 - tchvatal@suse.com - Depend on lua-5.1 as 5.3 is incompatible wrt bsc#1040034