Request 5753 (accepted)

Overview

Request 5753 (accepted)

No description set

Created by olh over 1 year ago
In state accepted

Submit vlc-beta

Submit package Staging / vlc-beta to package Extra / vlc-beta

vlc-beta.spec Changed

vlc-beta.patch Changed

@@ -1,9 +1,15 @@
-control/cli/cli.c: In function 'Run':
-control/cli/cli.c:541:1: error: no return statement in function returning non-void -Werror=return-type
-
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2105,7 +2105,7 @@ AS_IF(test "$SYS" = "linux" -a "${enabl
+@@ -10,7 +10,7 @@ VERSION_EXTRA=0
+ VERSION_DEV=dev
+ 
+ # libvlc .so version values
+-LIBVLC_ABI_MAJOR=12
++LIBVLC_ABI_MAJOR=123
+ LIBVLC_ABI_MINOR=0
+ LIBVLC_ABI_MICRO=0
+ 
+@@ -2054,7 +2054,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
  dnl
  dnl dvdread module: check for libdvdread
  dnl
@@ -12,7 +18,7 @@
  
  dnl
  dnl libdvdnav plugin
-@@ -2443,7 +2443,7 @@ AC_ARG_ENABLE(mod,
+@@ -2369,7 +2369,7 @@ AC_ARG_ENABLE(mod,
    AS_HELP_STRING(--disable-mod,
      do not use libmodplug (default auto)))
  if test "${enable_mod}" != "no" ; then
@@ -21,9 +27,40 @@
            VLC_ADD_PLUGIN(mod)
            VLC_ADD_CXXFLAGS(mod,$LIBMODPLUG_CFLAGS)
            VLC_ADD_CFLAGS(mod,$LIBMODPLUG_CFLAGS) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod
+@@ -4658,7 +4658,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
+    VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`
+ )
+ AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "$VLC_COMPILE_HOST", host which ran configure)
+-AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1 | sed -e 's/ *$//'`", compiler)
++AC_DEFINE_UNQUOTED(VLC_COMPILER, "gcc", compiler)
+ dnl
+ dnl  Handle substvars that use $(top_srcdir)
+ dnl
+--- a/include/vlc/libvlc_version.h
++++ b/include/vlc/libvlc_version.h
+@@ -54,7 +54,7 @@
+ 
+ 
+ /** LibVLC ABI major version number, updated when incompatible changes are added */
+-# define LIBVLC_ABI_VERSION_MAJOR  (12)
++# define LIBVLC_ABI_VERSION_MAJOR  (123)
+ 
+ /** LibVLC ABI minor version number, updated when compatible changes are added */
+ # define LIBVLC_ABI_VERSION_MINOR  (0)
+--- a/modules/codec/a52.c
++++ b/modules/codec/a52.c
+@@ -300,7 +300,7 @@ static int Open( vlc_object_t *p_this )
+     p_sys->i_flags |= A52_ADJUST_LEVEL;
+ 
+     /* Initialize liba52 */
+-    p_sys->p_liba52 = a52_init( 0 );
++    p_sys->p_liba52 = a52_init();
+     if( p_sys->p_liba52 == NULL )
+     {
+         msg_Err( p_this, "unable to initialize liba52" );
 --- a/modules/control/cli/cli.c
 +++ b/modules/control/cli/cli.c
-@@ -529,9 +529,8 @@ static void cli_client_delete(struct cli
+@@ -537,9 +537,8 @@ static void cli_client_delete(struct cli_client *cl)
      free(cl);
  }
  
@@ -34,7 +71,7 @@
      intf_sys_t *sys = intf->p_sys;
  
      vlc_thread_set_name("vlc-cli-server");
-@@ -566,6 +565,13 @@ static void *Run(void *data)
+@@ -576,6 +575,13 @@ static void *Run(void *data)
      }
  }
  
@@ -48,3 +85,14 @@
  #else
  static void msg_vprint(intf_thread_t *p_intf, const char *psz_fmt, va_list args)
  {
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -559,7 +559,7 @@ libvlccore_la_LDFLAGS = \
+ 	$(LDFLAGS_libvlccore) \
+ 	-no-undefined \
+ 	-export-symbols $(srcdir)/libvlccore.sym \
+-	-version-info 9:0:0
++	-version-info 123:0:0
+ libvlccore_la_DEPENDENCIES = libvlccore.sym
+ if HAVE_WIN32
+ libvlccore_la_DEPENDENCIES += libvlccore_win32_rc.$(OBJEXT)

vlc.a52dec.patch Deleted

vlc.hostname.patch Deleted

vlc-beta.rebase-changes.sh Added

@@ -0,0 +1,69 @@
+#!/bin/bash
+set -e
+unset LANG
+unset ${!LC_*}
+read td < <(mktemp --directory --tmpdir=/dev/shm .XXX)
+trap "rm -rf '${td}'" EXIT
+#
+d_extract="${td}/e"
+d_old="${td}/o"
+d_new="${td}/n"
+#
+read vlc_beta_pkg < <(readlink -f "$1")
+read vlc_git < <(readlink -f "$2")
+#
+test -f "${vlc_git}/.git/config"
+test -f "${vlc_beta_pkg}/.osc/_package"
+read pkg < "$_"
+test "${pkg}" = 'vlc-beta'
+mkdir "${d_extract}" "${d_old}" "${d_new}"
+pushd "${vlc_beta_pkg}" > /dev/null
+for patch in *.patch
+do
+	sed '
+	/^---:blank:/d
+	/^+++:blank:/d
+	/^@@:blank:/d
+	' < "${patch}" > "${d_old}/${patch}"
+done
+pushd "${vlc_git}" > /dev/null
+git --no-pager checkout master
+git --no-pager pull
+git --no-pager checkout vlc-beta
+git --no-pager rebase master
+git --no-pager format-patch --quiet --output-directory "${d_extract}" master..HEAD
+#
+sed -i -n '
+: sep
+n
+/^---$/b stat
+b sep
+: stat
+n
+/^$/b body
+b stat
+: body
+n
+/^diff:blank:\+--git:blank:\+/b body
+/^index:blank:\+0-9a-f\+/b body
+p
+b body
+' "${d_extract}"/*.patch
+pushd "${d_extract}" > /dev/null
+for patch in *.patch
+do
+	o="${patch}"
+	n="${patch#*-}"
+	mv "${o}" "${n}"
+	sed '
+	/^---:blank:/d
+	/^+++:blank:/d
+	/^@@:blank:/d
+	' < "${n}" > "${d_new}/${n}"
+	if diff -u "${d_old}/${n}" "${d_new}/${n}"
+	then
+		rm "${n}"
+	else
+		mv -vit "${vlc_beta_pkg}" "${n}"
+	fi
+done

Build Results
RPM Lint

Refresh

Comments for request 5753 0

Request History

olh created request over 1 year ago

olh accepted request over 1 year ago