Skip to content

Commit

Permalink
package/vlc: bump version to 3.0.19
Browse files Browse the repository at this point in the history
Rebased patch 0006 due to upstream commit
https://code.videolan.org/videolan/vlc/-/commit/3f9fc44176cc5505132977885799fa988c5e7701

Release notes: https://code.videolan.org/videolan/vlc/-/blob/3.0.19/NEWS

Signed-off-by: Bernd Kuhls <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>
(cherry picked from commit f45fa3b)
Signed-off-by: Peter Korsgaard <[email protected]>
  • Loading branch information
bkuhls authored and jacmet committed Nov 30, 2023
1 parent 69f4ee8 commit 31ddad9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ posix/thread.c: In function ‘vlc_clock_setup_once’:
posix/thread.c:88:18: error: lvalue required as left operand of assignment
vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC;

[Bernd: rebased for 3.0.19]
Signed-off-by: Bernd Kuhls <[email protected]>
---
src/posix/thread.c | 96 +++++++-----------------------------------------------
Expand Down Expand Up @@ -93,7 +94,7 @@ index dab8b71f97..8878941913 100644
-# warning Monotonic clock not available. Expect timing issues.
-#endif /* _POSIX_TIMERS */
-
static struct timespec mtime_to_ts (mtime_t date)
static struct timespec mtime_to_ts (vlc_tick_t date)
{
lldiv_t d = lldiv (date, CLOCK_FREQ);
@@ -233,14 +187,11 @@ void vlc_cond_init (vlc_cond_t *p_condvar)
Expand All @@ -117,7 +118,7 @@ index dab8b71f97..8878941913 100644

@@ -625,44 +576,27 @@ void vlc_control_cancel (int cmd, ...)

mtime_t mdate (void)
vlc_tick_t mdate (void)
{
-#if (_POSIX_TIMERS > 0)
struct timespec ts;
Expand All @@ -140,7 +141,7 @@ index dab8b71f97..8878941913 100644
}

#undef mwait
void mwait (mtime_t deadline)
void mwait (vlc_tick_t deadline)
{
-#if (_POSIX_CLOCK_SELECTION > 0)
- vlc_clock_setup ();
Expand All @@ -165,7 +166,7 @@ index dab8b71f97..8878941913 100644
}

#undef msleep
@@ -670,15 +604,7 @@ void msleep (mtime_t delay)
@@ -670,15 +604,7 @@ void msleep (vlc_tick_t delay)
{
struct timespec ts = mtime_to_ts (delay);

Expand Down
8 changes: 4 additions & 4 deletions package/vlc/vlc.hash
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# From https://get.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz.sha256
sha256 57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec vlc-3.0.18.tar.xz
# From https://get.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz.sha1
sha1 b11ccaa0f5ee15a550564817d60458eb0946f80e vlc-3.0.18.tar.xz
# From https://get.videolan.org/vlc/3.0.19/vlc-3.0.19.tar.xz.sha256
sha256 643e3294bafe922324663ca499515b7564f2794575fd7d2b7992d20896381745 vlc-3.0.19.tar.xz
# From https://get.videolan.org/vlc/3.0.19/vlc-3.0.19.tar.xz.sha1
sha1 6d162248a26fdd76a9d4e7e3d52f40d4326f72c1 vlc-3.0.19.tar.xz
# Locally computed
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
2 changes: 1 addition & 1 deletion package/vlc/vlc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

VLC_VERSION = 3.0.18
VLC_VERSION = 3.0.19
VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION)
VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz
VLC_LICENSE = GPL-2.0+, LGPL-2.1+
Expand Down

0 comments on commit 31ddad9

Please sign in to comment.