[vlc-commits] macosx: package libvlc_version.h, not libvlc_version.h.in.
vlc/vlc-2.0 | branch: master | Jerome Forissier | Tue Mar
4 16:03:30 2014 +0100| [734f22af2dbc8ba18ca86f7c9e3400eaaec28115] | committer:
Felix Paul Kühne
macosx: package libvlc_version.h, not libvlc_version.h.in.
Copy LibVLC headers from the installation directory: $(prefix)/include
rather than from the source directory, where the version file is still
unprocessed.
Signed-off-by: Felix Paul Kühne
(cherry picked from commit 3c9463627d55d5e3f21f26eada40eaa137d8eca5)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=734f22af2dbc8ba18ca86f7c9e3400eaaec28115
---
extras/package/macosx/package.mak |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 71b0fbd..acbb92f 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -51,7 +51,7 @@ VLC-tmp: vlc
mkdir -p $@/Contents/MacOS/share/locale/
cp -r "$(prefix)/lib/vlc/lua" "$(prefix)/share/vlc/lua"
$@/Contents/MacOS/share/
mkdir -p $@/Contents/MacOS/include/
- cp -r "$(srcdir)/include/vlc" $@/Contents/MacOS/include/
+ (cd "$(prefix)/include" && $(AMTAR) -c --exclude "plugins" vlc) |
$(AMTAR) -x -C $@/Contents/MacOS/include/
$(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png
$@/Contents/MacOS/share/vlc512x512.png
cat $(top_srcdir)/po/LINGUAS | while read i; do \
$(INSTALL) -d $@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: package libvlc_version.h, not libvlc_version.h.in.
vlc | branch: master | Jerome Forissier | Tue Mar 4
16:03:30 2014 +0100| [3c9463627d55d5e3f21f26eada40eaa137d8eca5] | committer:
Felix Paul Kühne
macosx: package libvlc_version.h, not libvlc_version.h.in.
Copy LibVLC headers from the installation directory: $(prefix)/include
rather than from the source directory, where the version file is still
unprocessed.
Signed-off-by: Felix Paul Kühne
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3c9463627d55d5e3f21f26eada40eaa137d8eca5
---
extras/package/macosx/package.mak |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 3a44df2..00f9eb2 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -50,7 +50,7 @@ VLC-tmp: vlc
mkdir -p $@/Contents/MacOS/share/locale/
cp -r "$(prefix)/lib/vlc/lua" "$(prefix)/share/vlc/lua"
$@/Contents/MacOS/share/
mkdir -p $@/Contents/MacOS/include/
- cp -r "$(srcdir)/include/vlc" $@/Contents/MacOS/include/
+ (cd "$(prefix)/include" && $(AMTAR) -c --exclude "plugins" vlc) |
$(AMTAR) -x -C $@/Contents/MacOS/include/
$(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png
$@/Contents/MacOS/share/vlc512x512.png
cat $(top_srcdir)/po/LINGUAS | while read i; do \
$(INSTALL) -d $@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: package libvlc_version.h, not libvlc_version.h.in.
vlc/vlc-2.1 | branch: master | Jerome Forissier | Tue Mar
4 16:03:30 2014 +0100| [7010a8d756de7495778d5c9ea570998a4c8ecf60] | committer:
Felix Paul Kühne
macosx: package libvlc_version.h, not libvlc_version.h.in.
Copy LibVLC headers from the installation directory: $(prefix)/include
rather than from the source directory, where the version file is still
unprocessed.
Signed-off-by: Felix Paul Kühne
(cherry picked from commit 3c9463627d55d5e3f21f26eada40eaa137d8eca5)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=7010a8d756de7495778d5c9ea570998a4c8ecf60
---
extras/package/macosx/package.mak |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 53c341c..19ace18 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -49,7 +49,7 @@ VLC-tmp: vlc
mkdir -p $@/Contents/MacOS/share/locale/
cp -r "$(prefix)/lib/vlc/lua" "$(prefix)/share/vlc/lua"
$@/Contents/MacOS/share/
mkdir -p $@/Contents/MacOS/include/
- cp -r "$(srcdir)/include/vlc" $@/Contents/MacOS/include/
+ (cd "$(prefix)/include" && $(AMTAR) -c --exclude "plugins" vlc) |
$(AMTAR) -x -C $@/Contents/MacOS/include/
$(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png
$@/Contents/MacOS/share/vlc512x512.png
cat $(top_srcdir)/po/LINGUAS | while read i; do \
$(INSTALL) -d $@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libvlc_internal.h: delete unused function prototypes
vlc | branch: master | Jerome Forissier | Thu Feb 27 18:59:14 2014 +0100| [99fffd130aacfb01ac6e04740a553e1e79620b8e] | committer: Rémi Denis-Courmont libvlc_internal.h: delete unused function prototypes Signed-off-by: Rémi Denis-Courmont > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=99fffd130aacfb01ac6e04740a553e1e79620b8e --- lib/libvlc_internal.h |2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libvlc_internal.h b/lib/libvlc_internal.h index 64585a7..4008c53 100644 --- a/lib/libvlc_internal.h +++ b/lib/libvlc_internal.h @@ -88,8 +88,6 @@ struct libvlc_instance_t /* Thread context */ void libvlc_threads_init (void); void libvlc_threads_deinit (void); -void libvlc_log_init (void); -void libvlc_log_deinit (void); /* Events */ libvlc_event_manager_t * libvlc_event_manager_new( ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libvlc: fix possible free() of static const char[]
vlc/vlc-2.1 | branch: master | Jerome Forissier | Thu Feb
27 16:53:24 2014 +0100| [ee2540e70e963bba66482edf5022972234731c15] | committer:
Rémi Denis-Courmont
libvlc: fix possible free() of static const char[]
Signed-off-by: Rémi Denis-Courmont
(cherry picked from commit c88cf59b9da0d13559e0c63fb63a3fd7f1bd867a)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=ee2540e70e963bba66482edf5022972234731c15
---
lib/error.c | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/lib/error.c b/lib/error.c
index f942f4d..45397a6 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -33,11 +33,17 @@ static vlc_threadvar_t context;
static vlc_mutex_t lock = VLC_STATIC_MUTEX;
static uintptr_t refs = 0;
+static void free_msg (void *msg)
+{
+if (msg != oom)
+free (msg);
+}
+
void libvlc_threads_init (void)
{
vlc_mutex_lock (&lock);
if (refs++ == 0)
-vlc_threadvar_create (&context, free);
+vlc_threadvar_create (&context, free_msg);
vlc_mutex_unlock (&lock);
}
@@ -57,9 +63,7 @@ static char *get_error (void)
static void free_error (void)
{
-char *msg = get_error ();
-if (msg != oom)
-free (msg);
+free_msg (get_error ());
}
/**
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libvlc: fix possible free() of static const char[]
vlc | branch: master | Jerome Forissier | Thu Feb 27
16:53:24 2014 +0100| [c88cf59b9da0d13559e0c63fb63a3fd7f1bd867a] | committer:
Rémi Denis-Courmont
libvlc: fix possible free() of static const char[]
Signed-off-by: Rémi Denis-Courmont
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c88cf59b9da0d13559e0c63fb63a3fd7f1bd867a
---
lib/error.c | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/lib/error.c b/lib/error.c
index f942f4d..45397a6 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -33,11 +33,17 @@ static vlc_threadvar_t context;
static vlc_mutex_t lock = VLC_STATIC_MUTEX;
static uintptr_t refs = 0;
+static void free_msg (void *msg)
+{
+if (msg != oom)
+free (msg);
+}
+
void libvlc_threads_init (void)
{
vlc_mutex_lock (&lock);
if (refs++ == 0)
-vlc_threadvar_create (&context, free);
+vlc_threadvar_create (&context, free_msg);
vlc_mutex_unlock (&lock);
}
@@ -57,9 +63,7 @@ static char *get_error (void)
static void free_error (void)
{
-char *msg = get_error ();
-if (msg != oom)
-free (msg);
+free_msg (get_error ());
}
/**
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
