Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 5

mpfc.changes Changed

mpfc.spec Changed

@@ -1,50 +1,73 @@
-# vim: set sw=4 ts=4 et nu:
-
-%define soname 0
-
-Name:               mpfc
-Version:            1.3.8.1
-Release:            0.pm.1
-Summary:            Music Player for Linux Console
-# http://prdownloads.sourceforge.net/mpfc/mpfc-%{version}.tar.gz
-Source:             mpfc-%{version}.tar.bz2
-Source1:            mpfc.desktop
-# pbleser: use getaddrinfo() instead of gethostbyname() as the former also supports IPv6
-Patch1:             mpfc-getaddrinfo.patch
-# pbleser: fix missing standard library include(s)
-Patch2:             mpfc-fix_missing_std_headers.patch
-# pbleser: fix missing includes and declarations from internal code
-Patch3:             mpfc-fix_missing_includes.patch
-Source99:           mpfc-rpmlintrc
-URL:                http://sourceforge.net/projects/mpfc/
-Group:              Productivity/Multimedia/Sound/Players
-License:            GNU General Public License version 3 (GPL v3)
-BuildRoot:          %{_tmppath}/build-%{name}-%{version}
-BuildRequires:      ncurses-devel
-BuildRequires:      libicu-devel
-BuildRequires:      libmad-devel
-BuildRequires:      alsa-devel
-BuildRequires:      flac-devel
-BuildRequires:      libogg-devel libvorbis-devel
-%if 0%{?suse_version} >= 1140
-BuildRequires:      gpm-devel
+#
+# spec file for package mpfc
+#
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+%define soname 2
+Name:           mpfc
+Version:        2.0
+Release:        0
+Summary:        Music Player for Linux Console
+License:        GPL-2.0
+Group:          Productivity/Multimedia/Sound/Players
+Url:            https://code.google.com/p/mpfc/
+Source:         http://sourceforge.net/projects/mpfc/files/mpfc/%{name}-%{version}.tar.bz2
+Source1:        mpfc.desktop
+Source99:       mpfc-rpmlintrc
+#PATCH-FIX-UPSTREAM texinfo.patch avvissu@yandex.ru -- Fix no info dir entry in mpfc.info.gz
+Patch0:         mpfc-2.0-texinfo.patch
+#PATCH-FIX-UPSTREAM FSF.patch avvissu@yandex.ru -- Fix wrong fsf address
+Patch1:         mpfc-2.0-FSF.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  gcc
+BuildRequires:  glibc-devel
+BuildRequires:  gpm-devel
+BuildRequires:  libtool
+BuildRequires:  make
+BuildRequires:  makeinfo
+BuildRequires:  pkgconfig
+BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(flac)
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gstreamer-audio-1.0)
+BuildRequires:  pkgconfig(icu-uc)
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(mad)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(taglib)
+BuildRequires:  pkgconfig(vorbis)
+%if 0%{?suse_version} >= 1320
+BuildRequires:  pkgconfig(ncurses)
 %else
-BuildRequires:      gpm
+BuildRequires:  ncurses-devel
 %endif
-BuildRequires:      bison flex
-BuildRequires:      gcc make glibc-devel pkgconfig
-BuildRequires:      autoconf automake libtool
-BuildRequires:      update-desktop-files
-Requires:           libmpfc%{soname} = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 MPFC is a full-featured curses-based music player for Linux. It supports the
 standard playlist paradigm and a number of input file formats through loadable
 modules (plugins).
 
-%package -n libmpfc%{soname}
-Summary:            Music Player for Linux Console Library
-Group:              System/Libraries
+%package -n     libmpfc%{soname}
+Summary:        Music Player for Linux Console Library
+Group:          System/Libraries
 
 %description -n libmpfc%{soname}
 MPFC is a full-featured curses-based music player for Linux. It supports the
@@ -54,10 +77,10 @@
 This package contains the libmpfc library, that is used by mpfc and its
 plugins.
 
-%package -n libmpfc-devel
-Summary:            Development environment for mpfc plugins
-Group:              Development/Libraries/C and C++
-Requires:           libmpfc%{soname} = %{version}
+%package -n     libmpfc-devel
+Summary:        Development environment for mpfc plugins
+Group:          Development/Libraries/C and C++
+Requires:       libmpfc%{soname} = %{version}
 
 %description -n libmpfc-devel
 MPFC is a full-featured curses-based music player for Linux. It supports the
@@ -68,88 +91,70 @@
 
 %prep
 %setup -q
-%patch1
-%patch2
-%patch3
+%patch0 -p1
+%patch1 -p1
+
+touch NEWS ChangeLog
 
 %build
-CFLAGS="%{optflags} -Wall -Wno-unused -I/usr/include/ncursesw" \
+autoreconf -fiv
+%if 0%{?suse_version} < 1320
+export CURSES_CFLAGS="%{optflags} -Wall -Wno-unused -I%{_includedir}/ncursesw" \
+export CURSES_LIBS="L%{libdir} -lncursesw -ltinfo"
+%endif
+
 %configure \
     --disable-rpath \
     --enable-gpm \
-    --enable-mp3 \
-    --enable-flac \
     --enable-cue \
+    --enable-m3u \
+    --enable-pls \
     --enable-audiocd \
-    --enable-ogg \
-    --enable-alsa \
-    --enable-wav \
-    --enable-disk_writer \
-    --enable-oss
+	--enable-static=no
 
-%__make %{?_smp_flags}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
-find "%{buildroot}%{_libdir}" -type f $ -name '*.a' -o -name '*.la' $ -exec %__rm {} \;
+find %{buildroot} -type f -name "*.la" -delete -print
 
-for p in general charset effect; do
+for p in general; do
     # using mkdir here on purpose, as mkdir_p and install -d fail silently if the
     # directory already exists, but we want the build to fail if mpfc suddenly has
     # plugins in there (to change the spec file accordingly)
-    %__mkdir "%{buildroot}%{_libdir}/mpfc/$p"
+    mkdir "%{buildroot}%{_libdir}/mpfc/$p"
 done
 
-%__install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
-%suse_update_desktop_file -r "%{name}" AudioVideo Player
+install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
 
 %find_lang "%{name}"
 
 %post   -n libmpfc%{soname} -p /sbin/ldconfig
+
 %postun -n libmpfc%{soname} -p /sbin/ldconfig
 
 %post
+%if 0%{?suse_version} >= 1140
+%desktop_database_post
+%endif
 %install_info --info-dir="%{_infodir}" "%{_infodir}/mpfc.info%{ext_info}"
 
 %postun

mpfc-2.0-FSF.patch Added

@@ -0,0 +1,1606 @@
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/configure mpfc-2.0/configure
+--- mpfc-2.0.orig/configure	2014-01-31 19:43:59.000000000 +0300
++++ mpfc-2.0/configure	2015-02-24 17:44:10.790480595 +0300
+@@ -12494,7 +12494,7 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301 USA
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/cfg.c mpfc-2.0/libmpfc/cfg.c
+--- mpfc-2.0.orig/libmpfc/cfg.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/cfg.c	2015-02-24 17:44:10.083490982 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ 
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/cfg_rcfile.c mpfc-2.0/libmpfc/cfg_rcfile.c
+--- mpfc-2.0.orig/libmpfc/cfg_rcfile.c	2014-01-30 23:30:35.000000000 +0300
++++ mpfc-2.0/libmpfc/cfg_rcfile.c	2015-02-24 17:44:10.119490453 +0300
+@@ -17,8 +17,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <ctype.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/command.c mpfc-2.0/libmpfc/command.c
+--- mpfc-2.0.orig/libmpfc/command.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/command.c	2015-02-24 17:44:10.089490893 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/logger.c mpfc-2.0/libmpfc/logger.c
+--- mpfc-2.0.orig/libmpfc/logger.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/logger.c	2015-02-24 17:44:10.096490791 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdio.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/plugin.c mpfc-2.0/libmpfc/plugin.c
+--- mpfc-2.0.orig/libmpfc/plugin.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/plugin.c	2015-02-24 17:44:10.108490615 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <dlfcn.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/plugin_general.c mpfc-2.0/libmpfc/plugin_general.c
+--- mpfc-2.0.orig/libmpfc/plugin_general.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/plugin_general.c	2015-02-24 17:44:10.104490673 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/plugin_mng.c mpfc-2.0/libmpfc/plugin_mng.c
+--- mpfc-2.0.orig/libmpfc/plugin_mng.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/plugin_mng.c	2015-02-24 17:44:10.065491246 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdio.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/plugin_plist.c mpfc-2.0/libmpfc/plugin_plist.c
+--- mpfc-2.0.orig/libmpfc/plugin_plist.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/plugin_plist.c	2015-02-24 17:44:10.085490952 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <dlfcn.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/song_info.c mpfc-2.0/libmpfc/song_info.c
+--- mpfc-2.0.orig/libmpfc/song_info.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/song_info.c	2015-02-24 17:44:10.111490570 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdlib.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/string.c mpfc-2.0/libmpfc/string.c
+--- mpfc-2.0.orig/libmpfc/string.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/string.c	2015-02-24 17:44:10.073491128 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdio.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfc/util.c mpfc-2.0/libmpfc/util.c
+--- mpfc-2.0.orig/libmpfc/util.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfc/util.c	2015-02-24 17:44:10.102490702 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <stdarg.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd.c mpfc-2.0/libmpfcwnd/wnd.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd.c	2015-02-24 17:44:10.227488866 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #include <assert.h>
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd.h mpfc-2.0/libmpfcwnd/wnd.h
+--- mpfc-2.0.orig/libmpfcwnd/wnd.h	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd.h	2015-02-24 17:44:10.364486854 +0300
+@@ -16,8 +16,8 @@
+  *  
+  * You should have received a copy of the GNU General Public 
+  * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+- * MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
++ * MA 02110-1301 USA
+  */
+ 
+ #ifndef __SG_MPFC_WND_H__
+diff -U 3 -H -d -r -N -- mpfc-2.0.orig/libmpfcwnd/wnd_basic.c mpfc-2.0/libmpfcwnd/wnd_basic.c
+--- mpfc-2.0.orig/libmpfcwnd/wnd_basic.c	2014-01-26 12:40:36.000000000 +0300
++++ mpfc-2.0/libmpfcwnd/wnd_basic.c	2015-02-24 17:44:10.371486750 +0300
+@@ -16,8 +16,8 @@
+  *

mpfc-2.0-texinfo.patch Added

mpfc-fix_missing_includes.patch Deleted

@@ -1,146 +0,0 @@
---- libmpfcwnd/wnd_repval.c.orig	2011-03-13 21:47:14.000000000 +0100
-+++ libmpfcwnd/wnd_repval.c	2011-03-13 21:47:30.000000000 +0100
-@@ -25,6 +25,7 @@
- #include "wnd_dialog.h"
- #include "wnd_editbox.h"
- #include "wnd_repval.h"
-+#include "wnd_label.h"
- 
- /* Create a repeat value dialog */
- dialog_t *wnd_repval_new( wnd_t *parent, void *on_ok, int dig )
---- libmpfcwnd/wnd_filebox.c.orig	2011-03-13 21:45:32.000000000 +0100
-+++ libmpfcwnd/wnd_filebox.c	2011-03-13 21:46:28.000000000 +0100
-@@ -33,6 +33,9 @@
- #include "wnd_editbox.h"
- #include "wnd_filebox.h"
- #include "wnd_hbox.h"
-+#include "wnd_label.h"
-+
-+extern int mbslen( char *str );
- 
- /* Create a new file box */
- filebox_t *filebox_new( wnd_t *parent, char *id, char *text, char letter,
---- libmpfcwnd/wnd_combobox.c.orig	2011-03-13 21:46:39.000000000 +0100
-+++ libmpfcwnd/wnd_combobox.c	2011-03-13 21:47:06.000000000 +0100
-@@ -28,6 +28,9 @@
- #include "wnd_dlgitem.h"
- #include "wnd_editbox.h"
- #include "wnd_hbox.h"
-+#include "wnd_label.h"
-+
-+extern int mbslen( char *str );
- 
- /* Create a new combo box */
- combo_t *combo_new( wnd_t *parent, char *id, char *text, char letter, 
---- libmpfcwnd/wnd_print.c.orig	2011-03-13 21:44:42.000000000 +0100
-+++ libmpfcwnd/wnd_print.c	2011-03-13 21:44:50.000000000 +0100
-@@ -32,6 +32,7 @@
- #include "types.h"
- #include "wnd.h"
- #include "wnd_print.h"
-+#include "util.h"
- 
- /* Move cursor to a specified position */
- void wnd_move( wnd_t *wnd, wnd_move_style_t style, int x, int y )
---- libmpfcwnd/wnd_mouse.c.orig	2011-03-13 21:45:09.000000000 +0100
-+++ libmpfcwnd/wnd_mouse.c	2011-03-13 21:45:14.000000000 +0100
-@@ -27,6 +27,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include "wnd.h"
-+#include "util.h"
- 
- /* Initialize mouse */
- wnd_mouse_data_t *wnd_mouse_init( wnd_global_data_t *global )
---- libmpfcwnd/wnd.c.orig	2011-03-13 21:43:05.000000000 +0100
-+++ libmpfcwnd/wnd.c	2011-03-13 21:54:48.000000000 +0100
-@@ -29,6 +29,9 @@
- #include "logger.h"
- #include "wnd.h"
- #include "wnd_root.h"
-+#include "util.h"
-+
-+extern int mbslen( char *str );
- 
- /* Initialize window system and create root window */
- wnd_t *wnd_init( cfg_node_t *cfg_list, logger_t *log )
---- src/info_rw_thread.c.orig	2011-03-13 21:50:18.000000000 +0100
-+++ src/info_rw_thread.c	2011-03-13 21:50:35.000000000 +0100
-@@ -27,6 +27,7 @@
- #include "info_rw_thread.h"
- #include "player.h"
- #include "song.h"
-+#include "util.h"
- 
- /* Thread queue */
- irw_queue_t *irw_head, *irw_tail;
---- src/player.c.orig	2011-03-13 21:47:47.000000000 +0100
-+++ src/player.c	2011-03-13 21:58:43.000000000 +0100
-@@ -58,7 +58,15 @@
- #include "wnd_multiview_dialog.h"
- #include "wnd_radio.h"
- #include "wnd_root.h"
-+#include "wnd_repval.h"
- #include "xconvert.h"
-+#include "info_rw_thread.h"
-+#include "outp.h"
-+#include "inp.h"
-+#include "genp.h"
-+extern void outp_set_mixer_type( out_plugin_t *p, plugin_mixer_type_t type );
-+extern dword inp_get_flags( in_plugin_t *p );
-+extern void pmng_hook( pmng_t *pmng, char *hook );
- 
- /*****
-  *
---- src/plist.c.orig	2011-03-13 21:58:13.000000000 +0100
-+++ src/plist.c	2011-03-13 21:58:20.000000000 +0100
-@@ -36,6 +36,7 @@
- #include "util.h"
- #include "undo.h"
- #include "wnd.h"
-+#include "info_rw_thread.h"
- 
- extern void pmng_hook( pmng_t *pmng, char *hook );
- 
---- libmpfc/id3.c.orig	2011-03-13 21:41:08.000000000 +0100
-+++ libmpfc/id3.c	2011-03-13 21:41:21.000000000 +0100
-@@ -26,6 +26,7 @@
- #include <unicode/ucnv.h>
- #include "types.h"
- #include "myid3.h"
-+#include "util.h"
- 
- /* Create a new empty tag */
- id3_tag_t *id3_new( void )
---- libmpfc/logger.c.orig	2011-03-13 21:42:40.000000000 +0100
-+++ libmpfc/logger.c	2011-03-13 21:42:49.000000000 +0100
-@@ -28,6 +28,8 @@
- #include "cfg.h"
- #include "logger.h"
- 
-+int logger_get_level( logger_t *log );
-+
- /* Initialize logger */
- logger_t *logger_new( cfg_node_t *cfg_list, char *file_name )
- {
---- libmpfc/vfs.c.orig	2011-03-13 21:42:13.000000000 +0100
-+++ libmpfc/vfs.c	2011-03-13 21:42:28.000000000 +0100
-@@ -33,6 +33,8 @@
- #include "vfs.h"
- #include "util.h"
- 
-+extern dword inp_get_flags( in_plugin_t *p );
-+
- /* Check if symbol is a special pattern symbol */
- #define VFS_SYM_SPECIAL(ch, space_is_special) \
- 		((ch) == '*' || (ch) == '?' || (ch) == '' || (ch) == '' || \
---- libmpfc/file_http.c.orig	2011-03-13 21:40:51.000000000 +0100
-+++ libmpfc/file_http.c	2011-03-13 21:41:02.000000000 +0100
-@@ -35,6 +35,7 @@
- #include "file.h"
- #include "file_http.h"
- #include "mystring.h"
-+#include "util.h"
- 
- /* Get file data */
- #define FHTTP_GET_DATA(data, file) \

mpfc-fix_missing_std_headers.patch Deleted

mpfc-getaddrinfo.patch Deleted

@@ -1,221 +0,0 @@
---- plugins/input/audiocd/cddb.c.orig	2011-03-13 21:10:31.000000000 +0100
-+++ plugins/input/audiocd/cddb.c	2011-03-13 21:36:20.000000000 +0100
-@@ -39,7 +39,7 @@
- #define CDDB_MAX_LINE_LEN 256
- 
- #define CDDB_BUF_SIZE 65536
--#define CDDB_PORT 8880
-+#define CDDB_PORT "8880"
- 
- /* Data */
- static char **cddb_data = NULL;
-@@ -201,10 +201,11 @@
- {
- 	int sockfd = -1, i;
- 	char bufCDDB_BUF_SIZE;
--	struct hostent *he;
--	struct sockaddr_in their_addr;
- 	char hostMAX_FILE_NAME;
- 	char category80;
-+    struct addrinfo hints;
-+    struct addrinfo *result, *rp;
-+    int s;
- 
- 	if (!cddb_server_found)
- 		return FALSE;
-@@ -213,23 +214,35 @@
- 	cddb_get_host_name(host);
- 
- 	/* Get host address */
-+    memset(&hints, 0, sizeof(struct addrinfo));
-+    hints.ai_family = AF_UNSPEC;
-+    hints.ai_socktype = SOCK_STREAM;
-+    hints.ai_flags = 0;
-+    hints.ai_protocol = 0;
- 	logger_message(acd_log, 1, _("Getting address of %s"), host);
--	he = gethostbyname(host);
--	if (he == NULL)
--		goto close;
--
--	/* Initialize socket and connect */
--	logger_message(acd_log, 1, _("Connecting to %s"), host);
--	sockfd = socket(AF_INET, SOCK_STREAM, 0);
--	if (sockfd < 0)
--		goto close;
--	their_addr.sin_family = AF_INET;
--	their_addr.sin_port = htons(CDDB_PORT);
--	their_addr.sin_addr = *((struct in_addr *)he->h_addr);
--	memset(&(their_addr.sin_zero), 0, 8);
--	if (connect(sockfd, (struct sockaddr *)&their_addr, 
--				sizeof(struct sockaddr)) < 0)
--		goto close;
-+    s = getaddrinfo(host, CDDB_PORT, &hints, &result);
-+    if (s != 0)
-+    {
-+	    logger_error(acd_log, 1, _("Failed to connect to %s: getaddrinfo: %s"), host, gai_strerror(s));
-+        goto close;
-+    }
-+    for (rp = result; rp != NULL; rp = rp->ai_next)
-+    {
-+        sockfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-+        if (sockfd < 0)
-+            continue;
-+	    logger_message(acd_log, 1, _("Connecting to %s"), host);
-+        if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) >= 0)
-+            break;
-+        close(sockfd);
-+    }
-+    if (rp == NULL)
-+    {
-+        freeaddrinfo(result);
-+	    logger_error(acd_log, 1, _("Failed to connect to %s"), host);
-+        goto close;
-+    }
-+    logger_message(acd_log, 1, _("Connected to %s"), host);
- 
- 	/* Communicate with server */
- 	logger_message(acd_log, 1, _("Sending query to server"));
-@@ -548,12 +561,13 @@
- void cddb_submit( char *filename )
- {	
- 	char *email, *category;
--	int sockfd = -1, i;
-+	int sockfd = -1;
- 	char bufCDDB_BUF_SIZE;
--	struct hostent *he;
--	struct sockaddr_in their_addr;
- 	char hostMAX_FILE_NAME;
- 	char *post_str;
-+    struct addrinfo hints;
-+    struct addrinfo *result, *rp;
-+    int s;
- 	
- 	/* Check data */
- 	if (cddb_data == NULL)
-@@ -584,22 +598,29 @@
- 
- 	/* Get host address */
- 	logger_message(acd_log, 1, _("Getting address of %s"), host);
--	he = gethostbyname(host);
--	if (he == NULL)
--		goto close;
--
--	/* Initialize socket and connect */
--	logger_message(acd_log, 1, _("Connecting to %s"), host);
--	sockfd = socket(AF_INET, SOCK_STREAM, 0);
--	if (sockfd < 0)
--		goto close;
--	their_addr.sin_family = AF_INET;
--	their_addr.sin_port = htons(CDDB_PORT);
--	their_addr.sin_addr = *((struct in_addr *)he->h_addr);
--	memset(&(their_addr.sin_zero), 0, 8);
--	if (connect(sockfd, (struct sockaddr *)&their_addr, 
--				sizeof(struct sockaddr)) < 0)
--		goto close;
-+    s = getaddrinfo(host, CDDB_PORT, &hints, &result);
-+    if (s != 0)
-+    {
-+	    logger_error(acd_log, 1, _("Failed to connect to %s: getaddrinfo: %s"), host, gai_strerror(s));
-+        goto close;
-+    }
-+    for (rp = result; rp != NULL; rp = rp->ai_next)
-+    {
-+        sockfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-+        if (sockfd < 0)
-+            continue;
-+	    logger_message(acd_log, 1, _("Connecting to %s"), host);
-+        if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) >= 0)
-+            break;
-+        close(sockfd);
-+    }
-+    if (rp == NULL)
-+    {
-+        freeaddrinfo(result);
-+	    logger_error(acd_log, 1, _("Failed to connect to %s"), host);
-+        goto close;
-+    }
-+    logger_message(acd_log, 1, _("Connected to %s"), host);
- 
- 	/* Communicate with server */
- 	logger_message(acd_log, 1, _("Posting data to server"));
---- libmpfc/file_http.c.orig	2011-03-13 21:21:09.000000000 +0100
-+++ libmpfc/file_http.c	2011-03-13 21:33:29.000000000 +0100
-@@ -43,16 +43,17 @@
- /* Open a file */
- file_t *fhttp_open( file_t *f, char *mode )
- {
--	int i;
- 	file_http_data_t *data;
--	struct hostent *he;
--	struct sockaddr_in their_addr;
- 	char str1024;
- 	char *header = NULL, *ph = NULL;
- 	int n, end, hs, code;
- 	char *name, *host_name, *file_name;
- 	int port;
- 	int read_size;
-+    struct addrinfo hints;
-+    struct addrinfo *result, *rp;
-+    int s;
-+    char portstr16;
- 
- 	/* Allocate memory for additional data */
- 	f->m_data = (void *)malloc(sizeof(*data));
-@@ -76,28 +77,37 @@
- 	{
- 		/* Parse URL */
- 		fhttp_parse_url(name, &host_name, &file_name, &port);
-+        snprintf(portstr, 16, "%d", port);
- 
--		/* Get host address */
-+        /* Get host address */
-+        memset(&hints, 0, sizeof(struct addrinfo));
-+        hints.ai_family = AF_UNSPEC;
-+        hints.ai_socktype = SOCK_STREAM;
-+        hints.ai_flags = 0;
-+        hints.ai_protocol = 0;
- 		logger_message(f->m_log, 1, _("Getting address of host %s"), host_name);
--		he = gethostbyname(host_name);
--		if (he == NULL)
--		{
--			goto close;
--		}
--		logger_message(f->m_log, 1, _("OK"));
--
--		/* Initialize socket and connect */
--		data->m_sock = socket(AF_INET, SOCK_STREAM, 0);
--		if (data->m_sock < 0)
--			goto close;
--		their_addr.sin_family = AF_INET;
--		their_addr.sin_port = htons(port);
--		their_addr.sin_addr = *((struct in_addr *)he->h_addr);
--		memset(&(their_addr.sin_zero), 0, 8);
--		logger_message(f->m_log, 1, _("Connecting to %s"), host_name);
--		if (connect(data->m_sock, (struct sockaddr *)&their_addr, 
--					sizeof(struct sockaddr)) < 0)
--			goto close;
-+        s = getaddrinfo(host_name, portstr, &hints, &result);
-+        if (s != 0)
-+        {

mpfc-1.3.8.1.tar.bz2 -> mpfc-2.0.tar.bz2 Changed

mpfc.desktop Changed