rpms/player/devel player-2.1.1-norpath.patch, NONE, 1.1 player-2.1.1-plugindir.patch, NONE, 1.1 player.spec, 1.1, 1.2 player-2.1.0rc2-norpath.patch, 1.1, NONE
Tim Niemueller
timn at fedoraproject.org
Wed Sep 3 09:52:57 UTC 2008
Author: timn
Update of /cvs/pkgs/rpms/player/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6832
Modified Files:
player.spec
Added Files:
player-2.1.1-norpath.patch player-2.1.1-plugindir.patch
Removed Files:
player-2.1.0rc2-norpath.patch
Log Message:
Copied latest fixes from F-8/F-9 branches to devel branch
Tim
player-2.1.1-norpath.patch:
--- NEW FILE player-2.1.1-norpath.patch ---
diff -urN player-2.1.1/aclocal.m4 player-2.1.1.norpath_am/aclocal.m4
--- player-2.1.1/aclocal.m4 2008-06-16 01:39:27.000000000 +0200
+++ player-2.1.1.norpath_am/aclocal.m4 2008-09-01 00:18:39.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,17 +11,14 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
+# serial 51 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -109,6 +106,7 @@
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
+
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
@@ -210,8 +208,6 @@
;;
esac
-_LT_REQUIRED_DARWIN_CHECKS
-
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
@@ -291,80 +287,9 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+$rm conftest*
])# _LT_LINKER_BOILERPLATE
-# _LT_REQUIRED_DARWIN_CHECKS
-# --------------------------
-# Check for some things on darwin
-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
- case $host_os in
- rhapsody* | darwin*)
- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
- AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-
- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
- [lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
- # By default we will add the -single_module flag. You can override
- # by either setting the environment variable LT_MULTI_MODULE
- # non-empty at configure time, or by adding -multi_module to the
- # link flags.
- echo "int foo(void){return 1;}" > conftest.c
- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
- -dynamiclib ${wl}-single_module conftest.c
- if test -f libconftest.dylib; then
- lt_cv_apple_cc_single_mod=yes
- rm -rf libconftest.dylib*
- fi
- rm conftest.c
- fi])
- AC_CACHE_CHECK([for -exported_symbols_list linker flag],
- [lt_cv_ld_exported_symbols_list],
- [lt_cv_ld_exported_symbols_list=no
- save_LDFLAGS=$LDFLAGS
- echo "_main" > conftest.sym
- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [lt_cv_ld_exported_symbols_list=yes],
- [lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
- ])
- case $host_os in
- rhapsody* | darwin1.[[0123]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
- darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*)
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- esac
- ;;
- esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
- _lt_dar_single_mod='$single_module'
- fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
- else
- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
- fi
- if test "$DSYMUTIL" != ":"; then
- _lt_dsymutil="~$DSYMUTIL \$lib || :"
- else
- _lt_dsymutil=
- fi
- ;;
- esac
-])
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
@@ -645,6 +570,7 @@
esac
;;
*64-bit*)
+ libsuff=64
case $host in
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
@@ -689,11 +615,7 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *)
- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
- LD="${LD-ld} -64"
- fi
- ;;
+ *) LD="${LD-ld} -64" ;;
esac
;;
esac
@@ -786,7 +708,7 @@
$2=yes
fi
fi
- $rm -r conftest*
+ $rm conftest*
LDFLAGS="$save_LDFLAGS"
])
@@ -1057,7 +979,7 @@
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
@@ -1065,7 +987,7 @@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
])
])
])
@@ -1382,7 +1304,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix[[4-9]]*)
+aix4* | aix5*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1707,11 +1629,13 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
[...13547 lines suppressed...]
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -77,7 +77,7 @@
am_pmaptest_OBJECTS = pmap_test.$(OBJEXT)
pmaptest_OBJECTS = $(am_pmaptest_OBJECTS)
pmaptest_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -170,7 +170,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -299,7 +298,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -539,8 +537,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -548,8 +546,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -575,8 +573,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -666,8 +664,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -679,8 +677,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -690,12 +688,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN player-2.1.1/utils/xmms-plugin/Makefile.in player-2.1.1.norpath_am/utils/xmms-plugin/Makefile.in
--- player-2.1.1/utils/xmms-plugin/Makefile.in 2008-06-16 01:40:22.000000000 +0200
+++ player-2.1.1.norpath_am/utils/xmms-plugin/Makefile.in 2008-09-01 00:19:06.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -64,7 +64,7 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libplayerxmms_la_CFLAGS) \
$(CFLAGS) $(libplayerxmms_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_XMMS_TRUE at am_libplayerxmms_la_rpath = -rpath $(libdir)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/libplayercore -I$(top_builddir)/client_libs/libplayerc++ -I$(top_builddir)/client_libs/libplayerc at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -146,7 +146,6 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMMY_EXTRA_CPPFLAGS = @DUMMY_EXTRA_CPPFLAGS@
DUMMY_LIB = @DUMMY_LIB@
ECHO = @ECHO@
@@ -275,7 +274,6 @@
ND_LIB = @ND_LIB@
NIMU_EXTRA_CPPFLAGS = @NIMU_EXTRA_CPPFLAGS@
NIMU_LIB = @NIMU_LIB@
-NMEDIT = @NMEDIT@
NOMAD_EXTRA_CPPFLAGS = @NOMAD_EXTRA_CPPFLAGS@
NOMAD_LIB = @NOMAD_LIB@
OBJDUMP = @OBJDUMP@
@@ -504,8 +502,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -513,8 +511,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -575,8 +573,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -588,8 +586,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -599,12 +597,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
player-2.1.1-plugindir.patch:
--- NEW FILE player-2.1.1-plugindir.patch ---
diff -urN player-2.1.1/libplayercore/Makefile.am player-2.1.1-plugindir/libplayercore/Makefile.am
--- player-2.1.1/libplayercore/Makefile.am 2008-06-11 03:11:18.000000000 +0200
+++ player-2.1.1-plugindir/libplayercore/Makefile.am 2008-09-02 19:59:41.000000000 +0200
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -g -Wall -D PLAYER_INSTALL_PREFIX="\"@PREFIX@\"" -I$(top_srcdir)
+AM_CPPFLAGS = -g -Wall -D PLAYER_INSTALL_PREFIX="\"@PREFIX@\"" -D PLAYER_PLUGINDIR="\"@libdir@/player\"" -D LIBDIR="\"@libdir@\"" -I$(top_srcdir)
# create the pkg-config entry for the server headers
pkgconfigdir = $(libdir)/pkgconfig
diff -urN player-2.1.1/libplayercore/plugins.cc player-2.1.1-plugindir/libplayercore/plugins.cc
--- player-2.1.1/libplayercore/plugins.cc 2008-04-13 00:16:48.000000000 +0200
+++ player-2.1.1-plugindir/libplayercore/plugins.cc 2008-09-02 20:00:15.000000000 +0200
@@ -169,8 +169,22 @@
if(!handle)
{
memset(fullpath,0,PATH_MAX);
- strncpy(fullpath,PLAYER_INSTALL_PREFIX, PATH_MAX);
- strncat(fullpath,"/lib/", PATH_MAX);
+ strncpy(fullpath,LIBDIR, PATH_MAX);
+ strncat(fullpath,"/", PATH_MAX);
+ strncat(fullpath,pluginname, PATH_MAX);
+ PLAYER_MSG1(1, "trying to load %s...", fullpath);
+ if((handle = lt_dlopenext(fullpath)))
+ PLAYER_MSG0(1, "success");
+ else
+ PLAYER_MSG1(1, "failed (%s)\n", lt_dlerror() );
+ }
+
+ // try to load it from prefix/lib/player
+ if(!handle)
+ {
+ memset(fullpath,0,PATH_MAX);
+ strncpy(fullpath,PLAYER_PLUGINDIR, PATH_MAX);
+ strncat(fullpath,"/", PATH_MAX);
strncat(fullpath,pluginname, PATH_MAX);
PLAYER_MSG1(1, "trying to load %s...", fullpath);
if((handle = lt_dlopenext(fullpath)))
Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/devel/player.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- player.spec 13 Aug 2008 09:07:33 -0000 1.1
+++ player.spec 3 Sep 2008 09:52:26 -0000 1.2
@@ -2,7 +2,7 @@
Name: player
Version: 2.1.1
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: Cross-platform robot device interface and server
Group: Applications/System
@@ -13,11 +13,13 @@
Source2: playercam.desktop
Source3: playerv.desktop
Patch0: %{name}-2.1.1-gcc43.patch
-Patch1: %{name}-2.1.0rc2-norpath.patch
+Patch1: %{name}-2.1.1-norpath.patch
Patch2: %{name}-2.1.0rc2-paths.patch
+Patch3: %{name}-2.1.1-plugindir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool-ltdl-devel
+BuildRequires: autoconf, automake
+BuildRequires: libtool, libtool-ltdl-devel
%if 0%{?fedora} <= 9
BuildRequires: geos-devel
%endif
@@ -37,7 +39,7 @@
BuildRequires: avahi-compat-howl-devel
BuildRequires: zlib-devel
BuildRequires: doxygen, graphviz
-BuildRequires: desktop-file-utils
+BuildRequires: desktop-file-utils
%description
Player is a network server for robot control. Running on your robot, Player
@@ -99,9 +101,13 @@
%patch0 -p1 -b .gcc43
%patch1 -p1 -b .norpath
%patch2 -p1 -b .paths
+%patch3 -p1 -b .plugindir
%build
+# Required because patches modify .am files
+aclocal
+autoreconf
# Broken: --enable-alsa --enable-sonartoranger --enable-lasertoranger
find ./ -name '*.c' -exec chmod a-x {} \;
find ./ -name '*.cc' -exec chmod a-x {} \;
@@ -128,6 +134,10 @@
rm -f $RPM_BUILD_ROOT%{_bindir}/*.pyo
#mv $RPM_BUILD_ROOT%{_libdir}/player/examples $RPM_BUILD_ROOT%{_datadir}/player/examples
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+mv $RPM_BUILD_ROOT%{_libdir}/liblododriver.so.?.?.? $RPM_BUILD_ROOT%{_libdir}/%{name}/liblododriver.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/liblododriver.so*
+
desktop-file-install --vendor="fedora" \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
%{SOURCE1}
@@ -158,6 +168,8 @@
%dir %{_datadir}/player
%dir %{_libdir}/player
%{_datadir}/applications/*.desktop
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}
%files python
%defattr(-,root,root,-)
@@ -184,6 +196,14 @@
%{_libdir}/*.a
%changelog
+* Tue Sep 02 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-5
+- Added plugindir patch
+
+* Fri Aug 15 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-4
+- Changed norpath patch, fixes build problem on Fedora 8
+- Added libtool BR
+- Added autotools BR, needed because for patches of .am files
+
* Mon Aug 08 2008 Jef Spaleta <jspaleta at fedoraproject dot org> - 2.1.1-3
- Review clean-ups
--- player-2.1.0rc2-norpath.patch DELETED ---
More information about the fedora-extras-commits
mailing list