Changes of Revision 290
vlc-beta.spec
Changed
x
1
2
Conflicts: vlc3
Conflicts: vlc-devel4
Conflicts: vlc-qt5
-Conflicts: libvlccore9 < %version-%release6
-Conflicts: libvlccore9-debuginfo < %version-%release7
Obsoletes: vlc-codec-gstreamer < %version-%release8
Obsoletes: vlc-codec-gstreamer-debuginfo < %version-%release9
Obsoletes: vlc-codecs < %version-%release10
11
BuildRequires: pkgconfig(shout) >= 2.112
BuildRequires: pkgconfig(libebml) >= 1.3.613
BuildRequires: pkgconfig(libmatroska)14
-BuildRequires: pkgconfig(libmodplug)15
+BuildRequires: pkgconfig(libmodplug) >= 0.8.9.016
BuildRequires: pkgconfig(shine) >= 3.0.017
BuildRequires: pkgconfig(mad)18
BuildRequires: pkgconfig(libmpg123)19
20
BuildRequires: pkgconfig(libswscale) >= 521
BuildRequires: pkgconfig(libpostproc) >= 5522
BuildRequires: pkgconfig(faad2)23
-%if 0%{?suse_version} > 150024
BuildRequires: pkgconfig(rav1e)25
-%endif26
-BuildRequires: pkgconfig(dav1d) >= 0.5.027
+BuildRequires: pkgconfig(dav1d) >= 1.0.028
BuildRequires: pkgconfig(vpx) >= 1.5.029
BuildRequires: pkgconfig(twolame)30
%if %{with fdk_aac}31
32
--enable-postproc \33
--enable-faad \34
--disable-aom \35
-%if 0%{?suse_version} > 150036
--enable-rav1e \37
-%endif38
--enable-dav1d \39
- --disable-vpx \40
--enable-vpx \41
--enable-twolame \42
%if %{with fdk_aac}43
vlc-beta.patch
Changed
65
1
2
-control/cli/cli.c: In function 'Run':3
-control/cli/cli.c:541:1: error: no return statement in function returning non-void -Werror=return-type4
-5
--- a/configure.ac6
+++ b/configure.ac7
-@@ -2105,7 +2105,7 @@ AS_IF(test "$SYS" = "linux" -a "${enabl8
+@@ -10,7 +10,7 @@ VERSION_EXTRA=09
+ VERSION_DEV=dev10
+ 11
+ # libvlc .so version values12
+-LIBVLC_ABI_MAJOR=1213
++LIBVLC_ABI_MAJOR=12314
+ LIBVLC_ABI_MINOR=015
+ LIBVLC_ABI_MICRO=016
+ 17
+@@ -2054,7 +2054,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 18
dnl19
dnl dvdread module: check for libdvdread20
dnl21
22
23
dnl24
dnl libdvdnav plugin25
-@@ -2443,7 +2443,7 @@ AC_ARG_ENABLE(mod,26
- AS_HELP_STRING(--disable-mod,27
- do not use libmodplug (default auto)))28
- if test "${enable_mod}" != "no" ; then29
-- PKG_CHECK_MODULES(LIBMODPLUG, libmodplug >= 0.8.9.0, 30
-+ PKG_CHECK_MODULES(LIBMODPLUG, libmodplug, 31
- VLC_ADD_PLUGIN(mod)32
- VLC_ADD_CXXFLAGS(mod,$LIBMODPLUG_CFLAGS)33
- VLC_ADD_CFLAGS(mod,$LIBMODPLUG_CFLAGS) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod34
--- a/modules/control/cli/cli.c35
+++ b/modules/control/cli/cli.c36
-@@ -529,9 +529,8 @@ static void cli_client_delete(struct cli37
+@@ -537,9 +537,8 @@ static void cli_client_delete(struct cli_client *cl)38
free(cl);39
}40
41
42
intf_sys_t *sys = intf->p_sys;43
44
vlc_thread_set_name("vlc-cli-server");45
-@@ -566,6 +565,13 @@ static void *Run(void *data)46
+@@ -576,6 +575,13 @@ static void *Run(void *data)47
}48
}49
50
51
#else52
static void msg_vprint(intf_thread_t *p_intf, const char *psz_fmt, va_list args)53
{54
+--- a/src/Makefile.am55
++++ b/src/Makefile.am56
+@@ -559,7 +559,7 @@ libvlccore_la_LDFLAGS = \57
+ $(LDFLAGS_libvlccore) \58
+ -no-undefined \59
+ -export-symbols $(srcdir)/libvlccore.sym \60
+- -version-info 9:0:061
++ -version-info 123:0:062
+ libvlccore_la_DEPENDENCIES = libvlccore.sym63
+ if HAVE_WIN3264
+ libvlccore_la_DEPENDENCIES += libvlccore_win32_rc.$(OBJEXT)65
_service:obs_scm:vlc-beta-20230420.41dc83024a.obscpio
Added
_service:obs_scm:vlc-beta-20230420.48a6b25031.obscpio
Deleted
_service:obs_scm:vlc-beta.obsinfo
Changed
9
1
2
name: vlc-beta3
-version: 20230420.48a6b250314
-mtime: 16819908495
-commit: 48a6b25031c13d179632d31ecd3c9a72f271e35a6
+version: 20230420.41dc83024a7
+mtime: 16820019458
+commit: 41dc83024aad0d541fcc497cf5b67ad1d6bb6dfd9
vlc-beta.rebase-changes.sh
Added
71
1
2
+#!/bin/bash3
+set -e4
+unset LANG5
+unset ${!LC_*}6
+read td < <(mktemp --directory --tmpdir=/dev/shm .XXX)7
+trap "rm -rf '${td}'" EXIT8
+#9
+d_extract="${td}/e"10
+d_old="${td}/o"11
+d_new="${td}/n"12
+#13
+read vlc_beta_pkg < <(readlink -f "$1")14
+read vlc_git < <(readlink -f "$2")15
+#16
+test -f "${vlc_git}/.git/config"17
+test -f "${vlc_beta_pkg}/.osc/_package"18
+read pkg < "$_"19
+test "${pkg}" = 'vlc-beta'20
+mkdir "${d_extract}" "${d_old}" "${d_new}"21
+pushd "${vlc_beta_pkg}" > /dev/null22
+for patch in *.patch23
+do24
+ sed '25
+ /^---:blank:/d26
+ /^+++:blank:/d27
+ /^@@:blank:/d28
+ ' < "${patch}" > "${d_old}/${patch}"29
+done30
+pushd "${vlc_git}" > /dev/null31
+git --no-pager checkout master32
+git --no-pager pull33
+git --no-pager checkout vlc-beta34
+git --no-pager rebase master35
+git --no-pager format-patch --quiet --output-directory "${d_extract}" master..HEAD36
+#37
+sed -i -n '38
+: sep39
+n40
+/^---$/b stat41
+b sep42
+: stat43
+n44
+/^$/b body45
+b stat46
+: body47
+n48
+/^diff:blank:\+--git:blank:\+/b body49
+/^index:blank:\+0-9a-f\+/b body50
+p51
+b body52
+' "${d_extract}"/*.patch53
+pushd "${d_extract}" > /dev/null54
+for patch in *.patch55
+do56
+ o="${patch}"57
+ n="${patch#*-}"58
+ mv "${o}" "${n}"59
+ sed '60
+ /^---:blank:/d61
+ /^+++:blank:/d62
+ /^@@:blank:/d63
+ ' < "${n}" > "${d_new}/${n}"64
+ if diff -u "${d_old}/${n}" "${d_new}/${n}"65
+ then66
+ rm "${n}"67
+ else68
+ mv -vit "${vlc_beta_pkg}" "${n}"69
+ fi70
+done71