python bindings: fix MediaDescriptor.get_meta method

[vlc] / bindings / python / setup.py

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 9904c72064e4252ad5d85331981a41dcef576eb5..00360460b20414b40c54a69c0af10fbc27ae1e0c 100644 (file)
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -1,10 +1,47 @@
 from distutils.core import setup, Extension
 import os
 
+# Get build variables (buildir, srcdir)
+try:
+    top_builddir=os.environ['top_builddir']
+except KeyError:
+    # Note: do not initialize here, so that we get
+    # a correct default value if the env. var is
+    # defined but empty
+    top_builddir=None
+if not top_builddir:
+    top_builddir = os.path.join( '..', '..' )
+    os.environ['top_builddir'] = top_builddir
+
+# Determine the extra link args. Normally, vlc-config should take care
+# of this and return the right path values, from a development tree or
+# an installed version.
+libtool=False
+linkargs=[]
+d=os.path.join(top_builddir, 'src', '.libs')
+if os.path.exists(d):
+    # We are in a development tree, which was compiled with libtool
+    libtool=True
+    linkargs=[ '-L' + d ]
+else:
+    d=os.path.join(top_builddir, 'src')
+    # We are in a development tree, which was compiled without libtool
+    if os.path.exists(d):
+        linkargs=[ '-L' + d ]
+
+# For out-of-tree compilations
+try:
+    srcdir=os.environ['srcdir']
+except KeyError:
+    # Note: same as above
+    srcdir=None
+if not srcdir:
+    srcdir = '.'
+
 def get_vlcconfig():
     vlcconfig=None
     for n in ( 'vlc-config',
-               os.path.sep.join( ('..', '..', 'vlc-config' ))):
+               os.path.join( top_builddir, 'vlc-config' )):
         if os.path.exists(n):
             vlcconfig=n
             break
@@ -15,12 +52,20 @@ def get_vlcconfig():
         vlcconfig="sh %s" % vlcconfig
     return vlcconfig
 
+def get_vlc_version():
+    vlcconfig=get_vlcconfig()
+    if vlcconfig is None:
+        return ""
+    else:
+        version=os.popen('%s --version' % vlcconfig, 'r').readline().strip()
+        return version
+    
 def get_cflags():
     vlcconfig=get_vlcconfig()
     if vlcconfig is None:
         return []
     else:
-        cflags=os.popen('%s --cflags' % vlcconfig, 'r').readline().rstrip().split()
+        cflags=os.popen('%s --cflags vlc' % vlcconfig, 'r').readline().rstrip().split()
         return cflags
 
 def get_ldflags():
@@ -28,29 +73,50 @@ def get_ldflags():
     if vlcconfig is None:
         return []
     else:
-       os.environ['top_builddir'] = '../..'
-        ldflags=os.popen('%s --libs vlc builtin' % vlcconfig, 'r').readline().rstrip().split()
+       ldflags = []
+       if os.sys.platform == 'darwin':
+           ldflags = "-read_only_relocs warning".split()
+        ldflags.extend(os.popen('%s --libs external' % vlcconfig,
+                               'r').readline().rstrip().split())
+       if os.sys.platform == 'darwin':
+           ldflags.append('-lstdc++')
+        if not libtool:
+            # vlc-config is broken and gives a -lvlc-control which
+            # does not exist if libtool is disabled.
+            ldflags.remove('-lvlc-control')
         return ldflags
 
+#source_files = [ 'vlc_module.c', 'vlc_mediacontrol.c',
+#                 'vlc_position.c', 'vlc_instance.c', 'vlc_input.c' ]
+source_files = [ 'vlc_module.c' ]
+
 # To compile in a local vlc tree
 vlclocal = Extension('vlc',
-                sources = ['vlcglue.c',
-                           '../../src/control/init.c'],
-                include_dirs = ['../../include', '../../', '/usr/win32/include' ],
-                extra_objects = [ '../../lib/libvlc.a' ],
+                     sources = [ os.path.join( srcdir, f ) for f in source_files ],
+                     include_dirs = [ top_builddir,
+                                      os.path.join( srcdir, '..', '..', 'include' ),
+                                      srcdir,
+                                      '/usr/win32/include' ],
+                extra_objects = [ ],
                 extra_compile_args = get_cflags(),
-               extra_link_args = [ '-L../..' ]  + get_ldflags(),
+               extra_link_args = linkargs + get_ldflags(),
                 )
 
-setup (name = 'MediaControl',
-       version = '0.8.2-1',
-       scripts = [ 'vlcdebug.py' ],
+setup (name = 'VLC Bindings',
+       version = get_vlc_version(),
+       #scripts = [ os.path.join( srcdir, 'vlcwrapper.py') ],
+       keywords = [ 'vlc', 'video' ],
+       license = "GPL", 
        description = """VLC bindings for python.
 
-This module provides a MediaControl object, which implements an API
-inspired from the OMG Audio/Video Stream 1.0 specification. Moreover,
-the module provides a Object type, which gives a low-level access to
-the vlc objects and their variables.
+This module provides bindings for the native libvlc API of the VLC
+video player. Documentation can be found on the VLC wiki : 
+http://wiki.videolan.org/index.php/ExternalAPI
+
+This module also provides a MediaControl object, which implements an
+API inspired from the OMG Audio/Video Stream 1.0 specification.
+Documentation can be found on the VLC wiki :
+http://wiki.videolan.org/index.php/PythonBinding
 
 Example session:
 
@@ -76,12 +142,5 @@ mc.pause(0)
 
 # Get status information
 mc.get_stream_information()
-
-# Access lowlevel objets
-o=vlc.Object(1)
-o.info()
-i=o.find_object('input')
-i.list()
-i.get('time')
        """,
        ext_modules = [ vlclocal ])