From 659d71d002312c5219f7109c3e135a73dbd0640e Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Wed, 13 May 2009 10:35:08 +0000
Subject: [PATCH] 0.5

---
 ...-missing-symbol-in-libxvmc_plugin.so.patch | 38 +++++++++++++++++++
 vlc-1.0.0-bugfix_backport.patch               | 12 ++++++
 vlc.spec                                      | 11 ++++--
 3 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 0001-Fix-missing-symbol-in-libxvmc_plugin.so.patch

diff --git a/0001-Fix-missing-symbol-in-libxvmc_plugin.so.patch b/0001-Fix-missing-symbol-in-libxvmc_plugin.so.patch
new file mode 100644
index 0000000..4e4511a
--- /dev/null
+++ b/0001-Fix-missing-symbol-in-libxvmc_plugin.so.patch
@@ -0,0 +1,38 @@
+From b0b453e4e70073d63aebe6bb259f4c891ba08c21 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet (kwizart) <kwizart@gmail.com>
+Date: Wed, 13 May 2009 11:17:44 +0200
+Subject: [PATCH] Fix missing symbol in libxvmc_plugin.so
+
+the XvMC plugin use xcommon.c where some part use
+HAVE_XINERAMA conditions.
+
+Missing symbols are :
+XineramaQueryScreens
+XineramaQueryExtension
+XineramaIsActive
+---
+ configure.ac |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index be6e24c..414a29d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4106,12 +4106,14 @@ AS_IF([test "$enable_xinerama" != "no"], [
+       VLC_ADD_LIBS([xvideo],[-lXinerama_pic])
+       VLC_ADD_LIBS([x11],[-lXinerama_pic])
+       VLC_ADD_LIBS([glx],[-lXinerama_pic])
++      VLC_ADD_LIBS([xvmc],[-lXinerama_pic])
+       ac_cv_have_xinerama="yes"
+     ],[
+       AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[
+         VLC_ADD_LIBS([xvideo],[-lXinerama])
+         VLC_ADD_LIBS([x11],[-lXinerama])
+         VLC_ADD_LIBS([glx],[-lXinerama])
++        VLC_ADD_LIBS([xvmc],[-lXinerama])
+         ac_cv_have_xinerama="yes"
+       ])
+     ])
+-- 
+1.6.0.6
+
diff --git a/vlc-1.0.0-bugfix_backport.patch b/vlc-1.0.0-bugfix_backport.patch
index b43657c..cce6381 100644
--- a/vlc-1.0.0-bugfix_backport.patch
+++ b/vlc-1.0.0-bugfix_backport.patch
@@ -1,3 +1,15 @@
+diff --git a/src/libvlccore.sym b/src/libvlccore.sym
+index ac68b0e..d72c10f 100644
+--- a/src/libvlccore.sym
++++ b/src/libvlccore.sym
+@@ -216,6 +216,7 @@ libvlc_InternalInit
+ libvlc_InternalWait
+ libvlc_Quit
+ LocaleFree
++make_URI
+ mdate
+ module_config_free
+ module_config_get
 diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
 index 4085e25..5794c0a 100644
 --- a/include/vlc/libvlc.h
diff --git a/vlc.spec b/vlc.spec
index cf97f19..0b35c55 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -13,7 +13,7 @@
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
 Version:	1.0.0
-Release:	0.4rc1%{?dist}
+Release:	0.5rc1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org/
@@ -27,6 +27,7 @@ Patch4:         310_all_mmx_pic.patch
 Patch5:         vlc-1.0.0-pre1-xulrunner-191_support.patch
 Patch6:         vlc-1.0.0-bugfix_backport.patch
 Patch7:         vlc-1.0.0-rc1-pkglibd.patch
+Patch8:         0001-Fix-missing-symbol-in-libxvmc_plugin.so.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -173,9 +174,6 @@ mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols.
 It can also be used as a server to stream in unicast or multicast in
 IPv4 or IPv6 on a high-bandwidth network.
 
-Non-default rpmbuild options:
---with dirac:   Enable dirac codec support
---with kate:    Enable kate codec support
 
 
 %description devel
@@ -247,6 +245,7 @@ sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 %endif
 %patch6 -p1 -b .bp
 %patch7 -p1 -b .pkglibd
+%patch8 -p1 -b .xvmc
 
 rm autotools/* m4/lib*
 cp -p %{_datadir}/gettext/config.rpath autotools
@@ -507,6 +506,10 @@ fi || :
 
 
 %changelog
+* Wed May 13 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.5rc1
+- Fix missing XvMC symbols
+- Fix export make_URI
+
 * Tue May 12 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.4rc1
 - Update to 1.0.0-rc1
 - Add 1.0-bugfix patches