🔖 split patch and set version

vivid-lapin · May 25, 2021 · 98a44d2 · 98a44d2
1 parent 6395024
commit 98a44d2
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,6 +32,8 @@ jobs:
         run: |
           patch -p1 < vlc-build/patches/build.sh.patch
           patch -p1 < vlc-build/patches/aribsub.c.patch
+          patch -p1 < vlc-build/patches/mpegts.c.patch
+          patch -p1 < vlc-build/patches/configure.ac.patch
           mkdir build
       - name: Build
         run: |

diff --git a/patches/aribsub.c.patch b/patches/aribsub.c.patch
@@ -36,15 +36,3 @@ index 46272ea1758a..dcae414aa82c 100644
      }
 
      block_Release( p_block );
-diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
-index 3dbe52775694..af2e308116bf 100644
---- a/modules/demux/mpeg/ts.c
-+++ b/modules/demux/mpeg/ts.c
-@@ -2192,6 +2192,7 @@ static void ProgramSetPCR( demux_t *p_demux, ts_pmt_t *p_pmt, mtime_t i_pcr )
-     {
-         p_pmt->pcr.i_first = i_pcr; // now seen
-     }
-+    msg_Dbg(p_demux, "i_pcr [%" PRId64 "][%" PRId64 "]", i_pcr, p_pmt->pcr.i_first);
-
-     if ( p_sys->i_pmt_es )
-     {
diff --git a/patches/configure.ac.patch b/patches/configure.ac.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index cc2037594b2c..f73e55e97ed1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,8 +6,8 @@ AC_INIT(vlc, 3.0.14)
+ VERSION_MAJOR=3
+ VERSION_MINOR=0
+ VERSION_REVISION=14
+-VERSION_EXTRA=0
+-VERSION_DEV=
++VERSION_EXTRA=miraktest
++VERSION_DEV=1
+
+ PKGDIR="vlc"
+ AC_SUBST(PKGDIR)
diff --git a/patches/mpegts.c.patch b/patches/mpegts.c.patch
@@ -0,0 +1,12 @@
+diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
+index 3dbe52775694..af2e308116bf 100644
+--- a/modules/demux/mpeg/ts.c
++++ b/modules/demux/mpeg/ts.c
+@@ -2192,6 +2192,7 @@ static void ProgramSetPCR( demux_t *p_demux, ts_pmt_t *p_pmt, mtime_t i_pcr )
+     {
+         p_pmt->pcr.i_first = i_pcr; // now seen
+     }
++    msg_Dbg(p_demux, "i_pcr [%" PRId64 "][%" PRId64 "]", i_pcr, p_pmt->pcr.i_first);
+
+     if ( p_sys->i_pmt_es )
+     {