[vlc-commits] [Git][videolan/npapi-vlc][master] Bump libvlcpp submodule

2021-01-30 Thread Hugo Beauzée-Luyssen


Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC Browser Plugins


Commits:
a19f7b3b by Hugo Beauzée-Luyssen at 2021-01-30T19:01:51+01:00
Bump libvlcpp submodule

- - - - -


1 changed file:

- vlcpp


Changes:

=
vlcpp
=
@@ -1 +1 @@
-Subproject commit 94ee174a05b5dc462aece1dc08cad735f06e7cfa
+Subproject commit 4ac2be9c5a9ae83dfba5fa605400491310ca2279



View it on GitLab: 
https://code.videolan.org/videolan/npapi-vlc/-/commit/a19f7b3bfce5a022785c89e4b4de4e3eddfda3c8

-- 
View it on GitLab: 
https://code.videolan.org/videolan/npapi-vlc/-/commit/a19f7b3bfce5a022785c89e4b4de4e3eddfda3c8
You're receiving this email because of your account on code.videolan.org.


___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] Bump libvlcpp submodule

2021-01-30 Thread Hugo Beauzée-Luyssen
npapi-vlc | branch: master | Hugo Beauzée-Luyssen  | Sat Jan 
30 19:01:40 2021 +0100| [a19f7b3bfce5a022785c89e4b4de4e3eddfda3c8] | committer: 
Hugo Beauzée-Luyssen

Bump libvlcpp submodule

> https://code.videolan.org/videolan/npapi-vlc/commit/a19f7b3bfce5a022785c89e4b4de4e3eddfda3c8
---

 vlcpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vlcpp b/vlcpp
index 94ee174..4ac2be9 16
--- a/vlcpp
+++ b/vlcpp
@@ -1 +1 @@
-Subproject commit 94ee174a05b5dc462aece1dc08cad735f06e7cfa
+Subproject commit 4ac2be9c5a9ae83dfba5fa605400491310ca2279

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] [Git][videolan/libvlcpp][master] EventManager: Don't expose onFreed event starting from 4.0

2021-01-30 Thread Hugo Beauzée-Luyssen


Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / libvlcpp


Commits:
4ac2be9c by Hugo Beauzée-Luyssen at 2021-01-30T18:55:47+01:00
EventManager: Dont expose onFreed event starting from 4.0

- - - - -


1 changed file:

- vlcpp/EventManager.hpp


Changes:

=
vlcpp/EventManager.hpp
=
@@ -334,6 +334,7 @@ class MediaEventManager : public EventManager
 #endif
 }
 
+#if LIBVLC_VERSION_INT < LIBVLC_VERSION(4, 0, 0, 0)
 /**
  * \brief onFreed Registers an event called when the media reaches a 
refcount of 0
  * \param f A std::function (or an equivalent Callable 
type)
@@ -354,6 +355,7 @@ class MediaEventManager : public EventManager
 (*callback)( media != nullptr ? std::make_shared( 
media, true ) : nullptr );
 });
 }
+#endif
 
 /**
  * \brief onStateChanged Registers an event called when the Media 
state changes



View it on GitLab: 
https://code.videolan.org/videolan/libvlcpp/-/commit/4ac2be9c5a9ae83dfba5fa605400491310ca2279

-- 
View it on GitLab: 
https://code.videolan.org/videolan/libvlcpp/-/commit/4ac2be9c5a9ae83dfba5fa605400491310ca2279
You're receiving this email because of your account on code.videolan.org.


___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] contrib: cddb: get rid of gettext dependency

2021-01-30 Thread Konstantin Pavlov
vlc/vlc-3.0 | branch: master | Konstantin Pavlov  | Thu 
Jan 14 20:19:02 2021 +0300| [9db5721b0e10f47eb93493aaa399c52a15e3d80b] | 
committer: Alexandre Janniaux

contrib: cddb: get rid of gettext dependency

We build cddb --without-iconv so it's not needed anyway

Signed-off-by: Alexandre Janniaux 

Cherry-picked from d0d4ca6aa0fe6fc73779b1fa261fde4f1009093f.

Signed-off-by: Alexandre Janniaux 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=9db5721b0e10f47eb93493aaa399c52a15e3d80b
---

 contrib/src/cddb/no-gettext.patch | 13 +
 contrib/src/cddb/rules.mak|  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/contrib/src/cddb/no-gettext.patch 
b/contrib/src/cddb/no-gettext.patch
new file mode 100644
index 00..7770237e1a
--- /dev/null
+++ b/contrib/src/cddb/no-gettext.patch
@@ -0,0 +1,13 @@
+diff -urN cddb.bak/configure.ac cddb/configure.ac
+--- cddb.bak/configure.ac  2021-01-14 18:46:48.702409826 +0300
 cddb/configure.ac  2021-01-14 18:47:04.354533931 +0300
+@@ -19,9 +19,6 @@
+ LIBCDDB_VERSION_NUM=131
+ AC_SUBST(LIBCDDB_VERSION_NUM)
+ 
+-dnl iconv uses gettext macros (dependency on config.rpath)
+-AM_GNU_GETTEXT_VERSION(0.14.4)
+-
+ dnl Process custom command-line options
+ AC_ARG_ENABLE([loglevel],
+   AC_HELP_STRING([--enable-loglevel=LVL],
diff --git a/contrib/src/cddb/rules.mak b/contrib/src/cddb/rules.mak
index e317152812..6bef997f9d 100644
--- a/contrib/src/cddb/rules.mak
+++ b/contrib/src/cddb/rules.mak
@@ -22,12 +22,13 @@ cddb: libcddb-$(CDDB_VERSION).tar.bz2 .sum-cddb
$(APPLY) $(SRC)/cddb/getenv-crash.patch
$(APPLY) $(SRC)/cddb/cddb-no-alarm.patch
$(APPLY) $(SRC)/cddb/fix-header-guards.patch
+   $(APPLY) $(SRC)/cddb/no-gettext.patch
 ifdef HAVE_WIN32
$(APPLY) $(SRC)/cddb/win32-pkg.patch
 endif
$(MOVE)
 
-DEPS_cddb = regex $(DEPS_regex) gettext $(DEPS_gettext)
+DEPS_cddb = regex $(DEPS_regex)
 
 .cddb: cddb
$(RECONF)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] contrib: libarchive: fix CPP being detected incorrectly

2021-01-30 Thread Alexandre Janniaux
vlc/vlc-3.0 | branch: master | Alexandre Janniaux  | Mon 
Jan 11 15:27:22 2021 +0100| [2b94f1527bc9f494c2215ebfebb115fd17600fe8] | 
committer: Alexandre Janniaux

contrib: libarchive: fix CPP being detected incorrectly

The preprocessor is not detected and it leads to failure with empty
$CPP variable being used on la_TYPE_UID_T, leading to a cascade of
detection errors and redefinition of some types.

PR sent upstream as https://github.com/libarchive/libarchive/pull/1481.

Cherry-picked from 17652505b49e98721a6351102c8fd7b026bc61dc.

Signed-off-by: Alexandre Janniaux 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2b94f1527bc9f494c2215ebfebb115fd17600fe8
---

 .../libarchive/configure.ac-add-AC_PROG_CPP.patch  | 27 ++
 contrib/src/libarchive/rules.mak   |  1 +
 2 files changed, 28 insertions(+)

diff --git a/contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch 
b/contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch
new file mode 100644
index 00..cdec009ef1
--- /dev/null
+++ b/contrib/src/libarchive/configure.ac-add-AC_PROG_CPP.patch
@@ -0,0 +1,27 @@
+From b4c5bf51436d876631e12ed8533e86405f8581d7 Mon Sep 17 00:00:00 2001
+From: Alexandre Janniaux 
+Date: Mon, 11 Jan 2021 12:31:53 +0100
+Subject: [PATCH] configure.ac: add AC_PROG_CPP
+
+Otherwise, the preprocessor is not detected and it leads to failure with
+empty $CPP variable being used on la_TYPE_UID_T, leading to a cascade of
+detection errors and redefinition of some types.
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 3b4602f5..d51fa19c 100644
+--- a/configure.ac
 b/configure.ac
+@@ -107,6 +107,7 @@ AC_SUBST(PLATFORMCPPFLAGS)
+ AC_PROG_CC
+ AC_PROG_CC_C99
+ AM_PROG_CC_C_O
++AC_PROG_CPP
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL
+-- 
+2.30.0
+
diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak
index 76eb29e13a..6c6f3cb039 100644
--- a/contrib/src/libarchive/rules.mak
+++ b/contrib/src/libarchive/rules.mak
@@ -25,6 +25,7 @@ endif
 ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/libarchive/winrt.patch
 endif
+   $(APPLY) $(SRC)/libarchive/configure.ac-add-AC_PROG_CPP.patch
$(call pkg_static,"build/pkgconfig/libarchive.pc.in")
$(MOVE)
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] mediacodec: fix orientation in --no-mediacodec-dr

2021-01-30 Thread Alexandre Janniaux
vlc/vlc-3.0 | branch: master | Alexandre Janniaux  | Fri 
Jan 22 16:34:00 2021 +0100| [aad6ab89fe4ee0931c9d04a81e210e8b40e77d30] | 
committer: Alexandre Janniaux

mediacodec: fix orientation in --no-mediacodec-dr

Fix #25210

Cherry-picked from 8e37293767c5c00eab6fae2c3dd488c78e0d9fef.

Signed-off-by: Alexandre Janniaux 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=aad6ab89fe4ee0931c9d04a81e210e8b40e77d30
---

 modules/codec/omxil/mediacodec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index fb0e74d92e..1affbd1c00 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -453,10 +453,10 @@ static int UpdateVout(decoder_t *p_dec)
 
 /* If MediaCodec can handle the rotation, reset the orientation to
  * Normal in order to ask the vout not to rotate. */
+p_dec->fmt_out.video.orientation = p_dec->fmt_in.video.orientation;
 if (p_sys->video.i_angle != 0)
 {
 assert(p_dec->fmt_out.i_codec == VLC_CODEC_ANDROID_OPAQUE);
-p_dec->fmt_out.video.orientation = p_dec->fmt_in.video.orientation;
 video_format_TransformTo(_dec->fmt_out.video, ORIENT_NORMAL);
 }
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits