Changes of Revision 11

vlc-beta.spec Changed
x
 
1
@@ -280,6 +280,7 @@
2
 VERSION_MAJOR=${VERSION:0:2}
3
 VERSION_MINOR=${VERSION:2:2}
4
 VERSION_REVISION=${VERSION:4:2}
5
+VERSION_REVISION=${VERSION_REVISION#0*}
6
 VERSION_EXTRA=${VERSION:6:2}
7
 VERSION_EXTRA=${VERSION_EXTRA#0*}
8
 VERSION_DEV=${VERSION#*.}
9
@@ -411,7 +412,11 @@
10
 %if %{with fdk_aac}
11
    --enable-fdkaac \
12
 %endif
13
+%if 0%{?suse_version} > 1500
14
    --enable-a52 \
15
+%else
16
+   --disable-a52 \
17
+%endif
18
    --enable-dca \
19
    --enable-flac \
20
    --enable-libmpeg2 \
21
vlc-beta.patch Changed
55
 
1
@@ -9,7 +9,7 @@
2
  LIBVLC_ABI_MINOR=0
3
  LIBVLC_ABI_MICRO=0
4
  
5
-@@ -2053,7 +2053,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
6
+@@ -2078,7 +2078,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 
7
  dnl
8
  dnl dvdread module: check for libdvdread
9
  dnl
10
@@ -18,7 +18,7 @@
11
  
12
  dnl
13
  dnl libdvdnav plugin
14
-@@ -2368,7 +2368,7 @@ AC_ARG_ENABLE(mod,
15
+@@ -2393,7 +2393,7 @@ AC_ARG_ENABLE(mod,
16
    AS_HELP_STRING(--disable-mod,
17
      do not use libmodplug (default auto)))
18
  if test "${enable_mod}" != "no" ; then
19
@@ -27,7 +27,7 @@
20
            VLC_ADD_PLUGIN(mod)
21
            VLC_ADD_CXXFLAGS(mod,$LIBMODPLUG_CFLAGS)
22
            VLC_ADD_CFLAGS(mod,$LIBMODPLUG_CFLAGS) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod
23
-@@ -4657,7 +4657,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
24
+@@ -4686,7 +4686,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",
25
     VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`
26
  )
27
  AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "$VLC_COMPILE_HOST", host which ran configure)
28
@@ -47,17 +47,6 @@
29
  
30
  /** LibVLC ABI minor version number, updated when compatible changes are added */
31
  # define LIBVLC_ABI_VERSION_MINOR  (0)
32
---- a/modules/codec/a52.c
33
-+++ b/modules/codec/a52.c
34
-@@ -300,7 +300,7 @@ static int Open( vlc_object_t *p_this )
35
-     p_sys->i_flags |= A52_ADJUST_LEVEL;
36
- 
37
-     /* Initialize liba52 */
38
--    p_sys->p_liba52 = a52_init( 0 );
39
-+    p_sys->p_liba52 = a52_init();
40
-     if( p_sys->p_liba52 == NULL )
41
-     {
42
-         msg_Err( p_this, "unable to initialize liba52" );
43
 --- a/modules/control/cli/cli.c
44
 +++ b/modules/control/cli/cli.c
45
 @@ -577,6 +577,7 @@ static void *Run(void *data)
46
@@ -70,7 +59,7 @@
47
  #else // _WIN32
48
 --- a/src/Makefile.am
49
 +++ b/src/Makefile.am
50
-@@ -560,7 +560,7 @@ libvlccore_la_LDFLAGS = \
51
+@@ -553,7 +553,7 @@ libvlccore_la_LDFLAGS = \
52
    $(LDFLAGS_libvlccore) \
53
    -no-undefined \
54
    -export-symbols $(srcdir)/libvlccore.sym \
55
_service:obs_scm:vlc-beta-20230728.72d3fc2f7d.obscpio Deleted
_service:obs_scm:vlc-beta-20230806.b79b76e107.obscpio Added
_service:obs_scm:vlc-beta.obsinfo Changed
9
 
1
@@ -1,4 +1,4 @@
2
 name: vlc-beta
3
-version: 20230728.72d3fc2f7d
4
-mtime: 1690530744
5
-commit: 72d3fc2f7dad56c81401a17d063b6c310507766b
6
+version: 20230806.b79b76e107
7
+mtime: 1691325235
8
+commit: b79b76e10772569a1d9a9b264df2f796edfdb6a3
9
vlc-beta.rebase-changes.sh Changed
10
 
1
@@ -34,7 +34,7 @@
2
 git --no-pager log --oneline -n1
3
 git --no-pager checkout vlc-beta
4
 git --no-pager rebase master
5
-git --no-pager format-patch --quiet --output-directory "${d_extract}" master..HEAD
6
+git --no-pager format-patch --no-base --quiet --output-directory "${d_extract}" master..HEAD
7
 #
8
 sed -i -n '
9
 : sep
10