Moved vlc08 to vlc.

8 files changed, 256 insertions, 273 deletions

diff --git a/multimedia/vlc/patches/patch-aa b/multimedia/vlc/patches/patch-aa
index 0f7a2f82e45..f9db0037bef 100644
--- a/multimedia/vlc/patches/patch-aa
+++ b/multimedia/vlc/patches/patch-aa
@@ -1,16 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2006/04/28 23:16:29 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2006/09/26 07:27:19 martti Exp $
 
---- modules/misc/network/ipv4.c.orig	2004-05-16 17:44:52.000000000 +0000
-+++ modules/misc/network/ipv4.c
-@@ -406,7 +406,11 @@ static int OpenUDP( vlc_object_t * p_thi
-         if( IN_MULTICAST( ntohl(inet_addr(psz_server_addr) ) ) )
-         {
-             /* set the time-to-live */
-+#ifdef __NetBSD__
-+            unsigned char ttl = p_socket->i_ttl;
-+#else
-             int ttl = p_socket->i_ttl;
-+#endif
-             if( ttl < 1 )
-             {
-                 ttl = config_GetInt( p_this, "ttl" );
+--- include/vlc_common.h.orig	2006-05-19 19:46:18.000000000 +0000
++++ include/vlc_common.h
+@@ -873,7 +873,7 @@ static inline void _SetQWBE( uint8_t *p,
+ #   define vlc_strtoll NULL
+ #endif
+ 
+-#if defined(SYS_BEOS)
++#if defined(SYS_BEOS) || defined(__DragonFly__)
+     typedef struct {
+         long long quot; /* Quotient. */
+         long long rem;  /* Remainder. */
diff --git a/multimedia/vlc/patches/patch-ab b/multimedia/vlc/patches/patch-ab
index 350303921ca..cc10f25e144 100644
--- a/multimedia/vlc/patches/patch-ab
+++ b/multimedia/vlc/patches/patch-ab
@@ -1,202 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2005/11/11 23:39:35 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2006/09/26 07:27:19 martti Exp $
 
---- modules/access/cdda/access.c.orig	2005-11-11 20:18:27.000000000 +0100
-+++ modules/access/cdda/access.c
-@@ -360,36 +360,36 @@ static void InformationCreate( input_thr
-   if (p_cdda->i_cddb_enabled) {
- 
-     dbg_print( INPUT_DBG_META, "field %s: %s\n", "Title",
--               p_cdda->cddb.disc->title );
-+               cddb_disc_get_title(p_cdda->cddb.disc) );
-     input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Title"),
--                   "%s", p_cdda->cddb.disc->title );
-+                   "%s", cddb_disc_get_title(p_cdda->cddb.disc));
- 
-     dbg_print( INPUT_DBG_META, "field %s: %s\n", "Artist",
--               p_cdda->cddb.disc->artist );
-+               cddb_disc_get_artist(p_cdda->cddb.disc));
-     input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Artist"),
--                   "%s", p_cdda->cddb.disc->artist );
-+                   "%s", cddb_disc_get_artist(p_cdda->cddb.disc));
- 
-     dbg_print( INPUT_DBG_META, "field %s: %s\n", "Genre",
--               p_cdda->cddb.disc->genre );
-+               cddb_disc_get_genre(p_cdda->cddb.disc));
-     input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Genre"),
--                   "%s", p_cdda->cddb.disc->genre );
-+                   "%s", cddb_disc_get_genre(p_cdda->cddb.disc));
- 
-     dbg_print( INPUT_DBG_META, "field %s: %s\n", "Extended Data",
--               p_cdda->cddb.disc->ext_data );
-+               cddb_disc_get_ext_data(p_cdda->cddb.disc));
-     input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Extended Data"),
--                   "%s", p_cdda->cddb.disc->ext_data );
-+                   "%s", cddb_disc_get_ext_data(p_cdda->cddb.disc));
- 
--    if (p_cdda->cddb.disc->year != 0)
-+    if (cddb_disc_get_year(p_cdda->cddb.disc))
-       input_Control( p_input, INPUT_ADD_INFO, _("General"),
--                     _("Year"), "%d", p_cdda->cddb.disc->year );
--    if ( p_cdda->cddb.disc->discid )
-+                     _("Year"), "%d", cddb_disc_get_year(p_cdda->cddb.disc));
-+    if ( cddb_disc_get_discid(p_cdda->cddb.disc))
-       input_Control( p_input, INPUT_ADD_INFO, _("General"),
--                     _("CDDB Disc ID"), "%x", p_cdda->cddb.disc->discid );
-+                     _("CDDB Disc ID"), "%x", cddb_disc_get_discid(p_cdda->cddb.disc));
- 
--    if ( p_cdda->cddb.disc->category != CDDB_CAT_INVALID )
-+    if ( cddb_disc_get_category(p_cdda->cddb.disc) != CDDB_CAT_INVALID )
-       input_Control( p_input, INPUT_ADD_INFO, _("General"),
-                      _("CDDB Disc Category"), "%s",
--                     CDDB_CATEGORY[p_cdda->cddb.disc->category] );
-+                     CDDB_CATEGORY[cddb_disc_get_category(p_cdda->cddb.disc)] );
-   }
- 
- #endif /*HAVE_LIBCDDB*/
-@@ -420,17 +420,17 @@ static void InformationCreate( input_thr
-         cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
-                                             i_track);
-         if (t != NULL) {
--          if ( t->artist != NULL && strlen(t->artist) ) {
-+          if ( cddb_track_get_artist(t) != NULL && strlen(cddb_track_get_artist(t)) ) {
-             input_Control( p_input, INPUT_ADD_INFO, track_str,
--                           _("Artist"), "%s", t->artist );
-+                           _("Artist"), "%s", cddb_track_get_artist(t));
-           }
--          if ( t->title != NULL && strlen(t->title) ) {
-+          if ( cddb_track_get_title(t) != NULL && strlen(cddb_track_get_title(t)) ) {
-             input_Control( p_input, INPUT_ADD_INFO, track_str,
--                           _("Title"), "%s",  t->title );
-+                           _("Title"), "%s",  cddb_track_get_title(t));
-           }
--          if ( t->ext_data != NULL && strlen(t->ext_data) ) {
-+          if ( cddb_track_get_ext_data(t) != NULL && cddb_track_get_ext_data(t) ) {
-             input_Control( p_input, INPUT_ADD_INFO, track_str,
--                           _("Extended Data"), "%s",  t->ext_data );
-+                           _("Extended Data"), "%s",  cddb_track_get_ext_data(t));
-           }
-         }
-       }
-@@ -505,13 +505,13 @@ GetCDDBInfo( const input_thread_t *p_inp
- 
-     for(i = 1; i <= p_cdda->i_nb_tracks; i++) {
-       cddb_track_t *t = cddb_track_new();
--      t->frame_offset = cdio_get_track_lba(cdio, i);
-+      cddb_track_set_frame_offset(t, cdio_get_track_lba(cdio, i));
-       cddb_disc_add_track(p_cdda->cddb.disc, t);
-     }
- 
--    p_cdda->cddb.disc->length =
-+    cddb_disc_set_length(p_cdda->cddb.disc,
-       cdio_get_track_lba(cdio, CDIO_CDROM_LEADOUT_TRACK)
--      / CDIO_CD_FRAMES_PER_SEC;
-+      / CDIO_CD_FRAMES_PER_SEC);
- 
-     if (!cddb_disc_calc_discid(p_cdda->cddb.disc)) {
-       msg_Err( p_input, "CDDB disc calc failed" );
-@@ -618,50 +618,50 @@ CDDAFormatStr(const input_thread_t *p_in
- #ifdef HAVE_LIBCDDB
-     case 'a':
-       if (!p_cdda->i_cddb_enabled) goto not_special;
--      add_format_str_info(p_cdda->cddb.disc->artist);
-+      add_format_str_info(cddb_disc_get_artist(p_cdda->cddb.disc));
-       break;
-     case 'A':
-       if (!p_cdda->i_cddb_enabled) goto not_special;
--      add_format_str_info(p_cdda->cddb.disc->title);
-+      add_format_str_info(cddb_disc_get_title(p_cdda->cddb.disc));
-       break;
-     case 'C':
-       if (!p_cdda->i_cddb_enabled) goto not_special;
--      add_format_str_info(CDDB_CATEGORY[p_cdda->cddb.disc->category]);
-+      add_format_str_info(CDDB_CATEGORY[cddb_disc_get_category(p_cdda->cddb.disc)]);
-       break;
-     case 'G':
-       if (!p_cdda->i_cddb_enabled) goto not_special;
--      add_format_str_info(p_cdda->cddb.disc->genre);
-+      add_format_str_info(cddb_disc_get_genre(p_cdda->cddb.disc));
-       break;
-     case 'I':
-       if (!p_cdda->i_cddb_enabled) goto not_special;
--      add_format_num_info(p_cdda->cddb.disc->discid, "%x");
-+      add_format_num_info(cddb_disc_get_discid(p_cdda->cddb.disc), "%x");
-       break;
-     case 'Y':
-       if (!p_cdda->i_cddb_enabled) goto not_special;
--      add_format_num_info(p_cdda->cddb.disc->year, "%5d");
-+      add_format_num_info(cddb_disc_get_year(p_cdda->cddb.disc), "%5d");
-       break;
-     case 't':
-       if (p_cdda->i_cddb_enabled) {
-         cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
-                                             i_track-1);
--        if (t != NULL && t->title != NULL)
--          add_format_str_info(t->title);
-+        if (t != NULL && cddb_track_get_title(t) != NULL)
-+          add_format_str_info(cddb_track_get_title(t));
-       } else goto not_special;
-       break;
-     case 'p':
-       if (p_cdda->i_cddb_enabled) {
-         cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
-                                             i_track-1);
--        if (t != NULL && t->artist != NULL)
--          add_format_str_info(t->artist);
-+        if (t != NULL && cddb_track_get_artist(t) != NULL)
-+          add_format_str_info(cddb_track_get_artist(t));
-       } else goto not_special;
-       break;
-     case 'e':
-       if (p_cdda->i_cddb_enabled) {
-         cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
-                                             i_track-1);
--        if (t != NULL && t->ext_data != NULL)
--          add_format_str_info(t->ext_data);
-+        if (t != NULL && cddb_track_get_ext_data(t) != NULL)
-+          add_format_str_info(cddb_track_get_ext_data(t));
-       } else goto not_special;
-       break;
- #endif
-@@ -762,31 +762,31 @@ CDDACreatePlayListItem(const input_threa
-     const char *psz_general_cat = _("General");
- 
-     playlist_ItemAddInfo( p_item, psz_general_cat, _("Album"),
--                      "%s", p_cdda->cddb.disc->title);
-+                      "%s", cddb_disc_get_title(p_cdda->cddb.disc));
-     playlist_ItemAddInfo( p_item, psz_general_cat, _("Disc Artist(s)"),
--                      "%s", p_cdda->cddb.disc->artist);
-+                      "%s", cddb_disc_get_artist(p_cdda->cddb.disc));
-     playlist_ItemAddInfo( p_item, psz_general_cat,
-                         _("CDDB Disc Category"),
--                      "%s", CDDB_CATEGORY[p_cdda->cddb.disc->category]);
-+                      "%s", CDDB_CATEGORY[cddb_disc_get_category(p_cdda->cddb.disc)]);
-     playlist_ItemAddInfo( p_item, psz_general_cat, _("Genre"),
--                      "%s", p_cdda->cddb.disc->genre);
--    if ( p_cdda->cddb.disc->discid ) {
-+                      "%s", cddb_disc_get_genre(p_cdda->cddb.disc));
-+    if ( cddb_disc_get_discid(p_cdda->cddb.disc) ) {
-       playlist_ItemAddInfo( p_item, psz_general_cat, _("CDDB Disc ID"),
--                        "%x", p_cdda->cddb.disc->discid );
-+                        "%x", cddb_disc_get_discid(p_cdda->cddb.disc));
-     }
--    if (p_cdda->cddb.disc->year != 0) {
-+    if (cddb_disc_get_year(p_cdda->cddb.disc) != 0) {
-       playlist_ItemAddInfo( p_item, psz_general_cat,
--                        _("Year"), "%5d", p_cdda->cddb.disc->year );
-+                        _("Year"), "%5d", cddb_disc_get_year(p_cdda->cddb.disc) );
-     }
- 
-     if (p_cdda->i_cddb_enabled) {
-       cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
-                                           i_track-1);
--      if (t != NULL && t->artist != NULL) {
-+      if (t != NULL && cddb_track_get_artist(t) != NULL) {
-         playlist_ItemAddInfo( p_item, psz_general_cat,
--                          _("Track Artist"), "%s", t->artist );
-+                          _("Track Artist"), "%s", cddb_track_get_artist(t));
-         playlist_ItemAddInfo( p_item , psz_general_cat,
--                          _("Track Title"), "%s",  t->title );
-+                          _("Track Title"), "%s",  cddb_track_get_title(t));
-       }
-     }
- 
+--- src/extras/libc.c.orig	2006-05-19 20:06:19.000000000 +0000
++++ src/extras/libc.c
+@@ -346,7 +346,7 @@ int64_t vlc_atoll( const char *nptr )
+ /*****************************************************************************
+  * lldiv: returns quotient and remainder
+  *****************************************************************************/
+-#if defined(SYS_BEOS)
++#if defined(SYS_BEOS) || defined(__DragonFly__)
+ lldiv_t vlc_lldiv( long long numer, long long denom )
+ {
+     lldiv_t d;
diff --git a/multimedia/vlc/patches/patch-ac b/multimedia/vlc/patches/patch-ac
deleted file mode 100644
index 4e5ff63bef5..00000000000
--- a/multimedia/vlc/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/28 23:16:29 wiz Exp $
-
---- modules/gui/wxwindows/open.cpp.orig	2004-05-21 11:24:58.000000000 +0000
-+++ modules/gui/wxwindows/open.cpp
-@@ -382,7 +382,7 @@ OpenDialog::OpenDialog( intf_thread_t *_
-                                                 wxU(_("Open:")) );
-     mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
-                                 wxPoint(20,25), wxSize(120, -1),
--                                0, NULL );
-+                                0, (const wxString*)NULL );
-     mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
-         "the full MRL you want to open.\n""Alternatively, the field will be "
-         "filled automatically when you use the controls below.")) );
-@@ -563,7 +563,7 @@ wxPanel *OpenDialog::FilePanel( wxWindow
-     wxBoxSizer *file_sizer = new wxBoxSizer( wxHORIZONTAL );
- 
-     file_combo = new wxComboBox( panel, FileName_Event, wxT(""),
--                                 wxPoint(20,25), wxSize(200, -1), 0, NULL );
-+                                 wxPoint(20,25), wxSize(200, -1), 0, (const wxString*)NULL );
-     wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
-                                             wxU(_("Browse...")) );
-     file_sizer->Add( file_combo, 1, wxALL, 5 );
diff --git a/multimedia/vlc/patches/patch-ad b/multimedia/vlc/patches/patch-ad
deleted file mode 100644
index 67174651cdd..00000000000
--- a/multimedia/vlc/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/04/28 23:16:29 wiz Exp $
-
---- modules/gui/wxwindows/streamout.cpp.orig	2004-05-16 11:42:29.000000000 +0000
-+++ modules/gui/wxwindows/streamout.cpp
-@@ -166,7 +166,7 @@ SoutDialog::SoutDialog( intf_thread_t *_
-     wxStaticText *mrl_label = new wxStaticText( panel, -1,
-                                                 wxU(_("Destination Target:")));
-     mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
--                                wxPoint(20,25), wxSize(120, -1), 0, NULL );
-+                                wxPoint(20,25), wxSize(120, -1), 0, (const wxString*)NULL );
-     mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
-         "the full MRL you want to open.\n""Alternatively, the field will be "
-         "filled automatically when you use the controls below")) );
-@@ -447,7 +447,7 @@ wxPanel *SoutDialog::AccessPanel( wxWind
-     subpanel_sizer = new wxFlexGridSizer( 3, 2, 20 );
-     label = new wxStaticText( access_subpanels[1], -1, wxU(_("Filename")) );
-     file_combo = new wxComboBox( access_subpanels[1], FileName_Event, wxT(""),
--                                 wxPoint(20,25), wxSize(200, -1), 0, NULL );
-+                                 wxPoint(20,25), wxSize(200, -1), 0, (const wxString*)NULL );
-     wxButton *browse_button = new wxButton( access_subpanels[1],
-                                   FileBrowse_Event, wxU(_("Browse...")) );
-     subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
diff --git a/multimedia/vlc/patches/patch-ae b/multimedia/vlc/patches/patch-ae
deleted file mode 100644
index e1ceafd4916..00000000000
--- a/multimedia/vlc/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/04/28 23:16:29 wiz Exp $
-
---- modules/gui/wxwindows/subtitles.cpp.orig	2004-03-05 19:25:18.000000000 +0000
-+++ modules/gui/wxwindows/subtitles.cpp
-@@ -85,7 +85,7 @@ SubsFileDialog::SubsFileDialog( intf_thr
-     char *psz_subsfile = config_GetPsz( p_intf, "sub-file" );
-     if( !psz_subsfile ) psz_subsfile = strdup("");
-     file_combo = new wxComboBox( panel, -1, wxL2U(psz_subsfile),
--                                 wxPoint(20,25), wxSize(300, -1), 0, NULL );
-+                                 wxPoint(20,25), wxSize(300, -1), 0, (const wxString *)NULL );
-     if( psz_subsfile ) free( psz_subsfile );
-     wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
-                                             wxU(_("Browse...")) );
diff --git a/multimedia/vlc/patches/patch-ag b/multimedia/vlc/patches/patch-ag
new file mode 100644
index 00000000000..81d947050da
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2006/09/26 07:27:19 martti Exp $
+
+--- ./modules/gui/wxwidgets/menus.cpp.orig	2006-05-04 14:22:54.000000000 +0200
++++ ./modules/gui/wxwidgets/menus.cpp
+@@ -1013,7 +1013,6 @@ void MenuEvtHandler::OnMenuEvent( wxComm
+                                        p_menuitemext->i_object_id );
+         if( p_object == NULL ) return;
+ 
+-        wxMutexGuiLeave(); // We don't want deadlocks
+         var_Set( p_object, p_menuitemext->psz_var, p_menuitemext->val );
+         //wxMutexGuiEnter();
+ 
diff --git a/multimedia/vlc/patches/patch-ah b/multimedia/vlc/patches/patch-ah
new file mode 100644
index 00000000000..edac89481bd
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ah
@@ -0,0 +1,18 @@
+$NetBSD: patch-ah,v 1.1 2006/09/26 07:27:19 martti Exp $
+
+--- src/misc/charset.c.orig	2006-05-06 17:52:13.000000000 +0200
++++ src/misc/charset.c
+@@ -37,10 +37,9 @@
+ #if !defined WIN32
+ # if HAVE_LANGINFO_CODESET
+ #  include <langinfo.h>
+-# else
+-#  if HAVE_SETLOCALE
+-#   include <locale.h>
+-#  endif
++# endif
++# if HAVE_SETLOCALE
++#  include <locale.h>
+ # endif
+ #elif defined WIN32
+ # include <windows.h>
diff --git a/multimedia/vlc/patches/patch-ai b/multimedia/vlc/patches/patch-ai
new file mode 100644
index 00000000000..dc52decfc38
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ai
@@ -0,0 +1,202 @@
+$NetBSD: patch-ai,v 1.1 2006/09/26 07:27:19 martti Exp $
+
+--- configure.orig	2006-05-06 15:54:17.000000000 +0000
++++ configure
+@@ -30035,13 +30035,13 @@ fi
+ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
+ THREAD_LIB=error
+ if test "${THREAD_LIB}" = "error"; then
+-  echo "$as_me:$LINENO: checking for main in -lpthread" >&5
+-echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
++  echo "$as_me:$LINENO: checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for main in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -30093,7 +30093,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
+ if test $ac_cv_lib_pthread_main = yes; then
+-  THREAD_LIB="-lpthread"
++  THREAD_LIB="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ fi
+ 
+ fi
+@@ -36628,7 +36628,7 @@ fi;
+ test "${enable_debug}" != "yes" && enable_debug="no"
+ 
+ 
+-if test "x${enable_debug}" == "xno"; then
++if test "x${enable_debug}" = "xno"; then
+   cat >>confdefs.h <<\_ACEOF
+ #define NDEBUG 1
+ _ACEOF
+@@ -37311,7 +37311,7 @@ echo "${ECHO_T}yes" >&6
+ 
+ 
+   for element in access_dv; do
+-    eval "LDFLAGS_${element}="'"'"-L${with_dv_raw1394}/lib -lraw1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
++    eval "LDFLAGS_${element}="'"'"-L${with_dv_raw1394}/lib -lraw1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"'
+     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+   done
+ 
+@@ -37563,7 +37563,7 @@ echo $ECHO_N "checking for avc1394 heade
+ echo "${ECHO_T}yes" >&6
+ 
+   for element in access_dv; do
+-    eval "LDFLAGS_${element}="'"'"-L${with_dv_avc1394}/lib -lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
++    eval "LDFLAGS_${element}="'"'"-L${with_dv_avc1394}/lib -lavc1394 -lrom1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"'
+     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+   done
+ 
+@@ -37727,7 +37727,7 @@ if test `eval echo '${'$as_ac_Header'}'`
+ _ACEOF
+ 
+   for element in access_dv; do
+-    eval "LDFLAGS_${element}="'"'"-lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
++    eval "LDFLAGS_${element}="'"'"-lavc1394 -lrom1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"'
+     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+   done
+ 
+@@ -37766,7 +37766,7 @@ echo "$as_me: error: cannot cd to ${real
+ echo "${ECHO_T}${real_dv_avc1394_tree}/src/.libs/libavc1394.a" >&6
+ 
+   for element in access_dv; do
+-    eval "LDFLAGS_${element}="'"'"-L${real_dv_avc1394_tree}/src/.libs -lavc1394 -lrom1394 -lpthread "'$'"{LDFLAGS_${element}} "'"'
++    eval "LDFLAGS_${element}="'"'"-L${real_dv_avc1394_tree}/src/.libs -lavc1394 -lrom1394 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} "'$'"{LDFLAGS_${element}} "'"'
+     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+   done
+ 
+@@ -43126,14 +43126,14 @@ echo "${ECHO_T}no" >&6
+ echo "$as_me: error: cannot cd to ${with_ffmpeg_tree}" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+-   if ! test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
++   if ! test -f "${real_ffmpeg_tree}/libavcodec.a"; then
+           echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+-     { { echo "$as_me:$LINENO: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&5
+-echo "$as_me: error: cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&2;}
++     { { echo "$as_me:$LINENO: error: cannot find ${real_ffmpeg_tree}/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&5
++echo "$as_me: error: cannot find ${real_ffmpeg_tree}/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+-   if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
++   if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec.a"; then
+      if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a"; then
+ 
+   for element in ffmpeg; do
+@@ -43144,13 +43144,13 @@ echo "$as_me: error: cannot find ${real_
+      else
+               echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+-       { { echo "$as_me:$LINENO: error: ${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&5
+-echo "$as_me: error: ${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&2;}
++       { { echo "$as_me:$LINENO: error: ${real_ffmpeg_tree}/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&5
++echo "$as_me: error: ${real_ffmpeg_tree}/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp" >&2;}
+    { (exit 1); exit 1; }; }
+      fi
+    fi
+-      echo "$as_me:$LINENO: result: ${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&5
+-echo "${ECHO_T}${real_ffmpeg_tree}/libavcodec/libavcodec.a" >&6
++      echo "$as_me:$LINENO: result: ${real_ffmpeg_tree}/libavcodec.a" >&5
++echo "${ECHO_T}${real_ffmpeg_tree}/libavcodec.a" >&6
+ 
+    if fgrep -s "CONFIG_ZLIB=yes" "${real_ffmpeg_tree}/config.mak"; then
+      if test "${with_ffmpeg_zlib}" != "yes"; then
+@@ -43318,7 +43318,7 @@ fi
+ 
+ 
+   for element in ffmpeg; do
+-    eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a "'$'"{LDFLAGS_${element}} "'"'
++    eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec.a "'$'"{LDFLAGS_${element}} "'"'
+     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+   done
+ 
+@@ -55864,7 +55864,7 @@ fi
+ 
+ 
+   for element in directfb; do
+-    eval "LDFLAGS_${element}="'"'"-ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"'
++    eval "LDFLAGS_${element}="'"'"-ldirectfb -lfusion -ldirect ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"'
+     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+   done
+ 
+@@ -56043,7 +56043,7 @@ if test "${with_directfb+set}" = set; th
+ 
+ 
+   for element in directfb; do
+-    eval "LDFLAGS_${element}="'"'"-L${with_directfb}/lib -ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"'
++    eval "LDFLAGS_${element}="'"'"-L${with_directfb}/lib -ldirectfb -lfusion -ldirect ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -ljpeg -lz -ldl "'$'"{LDFLAGS_${element}} "'"'
+     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+   done
+ 
+@@ -58056,7 +58056,7 @@ echo $ECHO_N "checking for XML parser to
+       LIBS_save="$LIBS"
+       LIBS_cclink="no"
+       for l in "`xml2-config --libs`" -lexpat -lxerces-c; do
+-        LIBS="$LIBS_save ${real_cyberlink_tree}/lib/unix/libclink.a -lpthread $l"
++        LIBS="$LIBS_save ${real_cyberlink_tree}/lib/unix/libclink.a ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $l"
+         cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -58120,7 +58120,7 @@ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+       done
+       LIBS="${LIBS_save}"
+-            if test "${LIBS_cclink}" == "no"; then
++            if test "${LIBS_cclink}" = "no"; then
+   { { echo "$as_me:$LINENO: error: cannot find XML parser for CyberLink
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot find XML parser for CyberLink
+@@ -58132,7 +58132,7 @@ fi
+ echo "${ECHO_T}${LIBS_cclink}" >&6
+ 
+   for element in upnp_cc; do
+-    eval "LDFLAGS_${element}="'"'"${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink} "'$'"{LDFLAGS_${element}} "'"'
++    eval "LDFLAGS_${element}="'"'"${real_cyberlink_tree}/lib/unix/libclink.a ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${LIBS_cclink} "'$'"{LDFLAGS_${element}} "'"'
+     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+   done
+ 
+@@ -58181,7 +58181,7 @@ if test "${ac_cv_lib_upnp_UpnpInit+set}"
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lupnp -lpthread $LIBS"
++LIBS="-lupnp ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -58244,7 +58244,7 @@ else
+   has_upnp="no"
+ fi
+ 
+-  if test "x${enable_upnp}" != "x" && test "${has_upnp}" == "no"; then
++  if test "x${enable_upnp}" != "x" && test "${has_upnp}" = "no"; then
+    
+     { { echo "$as_me:$LINENO: error: cannot find Intel UPnP SDK (libupnp)" >&5
+ echo "$as_me: error: cannot find Intel UPnP SDK (libupnp)" >&2;}
+@@ -58252,7 +58252,7 @@ echo "$as_me: error: cannot find Intel U
+ 
+ fi
+ 
+-  if test "${has_upnp}" == "yes"; then
++  if test "${has_upnp}" = "yes"; then
+ 
+ 
+   for element in upnp_intel; do
+@@ -58271,7 +58271,7 @@ else
+ fi
+ 
+ 
+-if test "${has_upnp}" == "yes"; then
++if test "${has_upnp}" = "yes"; then
+ 
+ 
+   PLUGINS="${PLUGINS} upnp_intel"