On Wed, 19 Mar 2014 02:11:15 +0000 peter green <plugw...@p10link.net> wrote: > Based on the patches for razorqt and various examples found by googling > I made player build. I have not tested it beyond that and I didn't find > any proper documention for the new parameters so i'm not positive it is > correct. > > Debdiff atached and uploaded to raspbian. No intent to NMU in debian. > >
I nmued this package to 5-days delay queue with the attached patch.
diff -Nru player-3.0.2+dfsg/debian/changelog player-3.0.2+dfsg/debian/changelog --- player-3.0.2+dfsg/debian/changelog 2013-09-06 14:14:40.000000000 +0800 +++ player-3.0.2+dfsg/debian/changelog 2014-09-26 22:04:54.000000000 +0800 @@ -1,3 +1,13 @@ +player (3.0.2+dfsg-4.2) unstable; urgency=medium + + * Fix for API changes of libstatgrab version 0.90 (Closes: #735572) + - Update build dependency accordingly to "libstatgrab-dev (>= 0.90)" + + [YunQiang Su] + * ruby-playerc.install: Use multiarch path. + + -- Peter Michael Green <plugw...@raspbian.org> Wed, 19 Mar 2014 01:30:56 +0000 + player (3.0.2+dfsg-4.1) unstable; urgency=low * Non-maintainer upload. diff -Nru player-3.0.2+dfsg/debian/control player-3.0.2+dfsg/debian/control --- player-3.0.2+dfsg/debian/control 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/control 2014-09-26 18:30:08.000000000 +0800 @@ -2,7 +2,7 @@ Section: science Priority: extra Maintainer: Michael Janssen <jamu...@debian.org> -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libgsl0-dev, libcv-dev, libhighgui-dev, libcvaux-dev, libgtk2.0-dev, libdc1394-22-dev, libboost-signals-dev, libboost-thread-dev, swig, libjpeg-dev, python-support, doxygen, linux-libc-dev | linux-kernel-headers, libgnomecanvas2-dev, python-dev, freeglut3-dev, graphviz, ruby, ruby-dev, libtheora-dev, libgeos-dev, libpqxx3-dev, libxmu-dev, libcvaux-dev, libasound2-dev, libstatgrab-dev, cmake, libusb-dev, libv4l-dev +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libgsl0-dev, libcv-dev, libhighgui-dev, libcvaux-dev, libgtk2.0-dev, libdc1394-22-dev, libboost-signals-dev, libboost-thread-dev, swig, libjpeg-dev, python-support, doxygen, linux-libc-dev | linux-kernel-headers, libgnomecanvas2-dev, python-dev, freeglut3-dev, graphviz, ruby, ruby-dev, libtheora-dev, libgeos-dev, libpqxx3-dev, libxmu-dev, libcvaux-dev, libasound2-dev, libstatgrab-dev (>= 0.90), cmake, libusb-dev, libv4l-dev XS-Python-Version: all Standards-Version: 3.9.3 Homepage: http://playerstage.sourceforge.net/ diff -Nru player-3.0.2+dfsg/debian/liblodo3.0-dev.install player-3.0.2+dfsg/debian/liblodo3.0-dev.install --- player-3.0.2+dfsg/debian/liblodo3.0-dev.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/liblodo3.0-dev.install 2014-09-26 20:31:39.000000000 +0800 @@ -1,2 +1,2 @@ -usr/lib/liblodo.so +usr/lib//liblodo.so usr/include/player-3.0/libpmap/lodo.h diff -Nru player-3.0.2+dfsg/debian/liblodo3.0.install player-3.0.2+dfsg/debian/liblodo3.0.install --- player-3.0.2+dfsg/debian/liblodo3.0.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/liblodo3.0.install 2014-09-26 20:31:39.000000000 +0800 @@ -1 +1 @@ -usr/lib/liblodo.so.* +usr/lib//liblodo.so.* diff -Nru player-3.0.2+dfsg/debian/libplayerc++3.0-dev.install player-3.0.2+dfsg/debian/libplayerc++3.0-dev.install --- player-3.0.2+dfsg/debian/libplayerc++3.0-dev.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayerc++3.0-dev.install 2014-09-26 20:31:39.000000000 +0800 @@ -1,4 +1,4 @@ -usr/lib/libplayerc++.so +usr/lib//libplayerc++.so usr/include/player-3.0/libplayerc++ -usr/lib/pkgconfig/playerc++.pc +usr/lib//pkgconfig/playerc++.pc usr/share/cmake/Modules/UsePlayerC++.cmake usr/lib/player-3.0 diff -Nru player-3.0.2+dfsg/debian/libplayerc3.0-dev.install player-3.0.2+dfsg/debian/libplayerc3.0-dev.install --- player-3.0.2+dfsg/debian/libplayerc3.0-dev.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayerc3.0-dev.install 2014-09-26 20:31:39.000000000 +0800 @@ -1,4 +1,4 @@ -usr/lib/libplayerc.so +usr/lib//libplayerc.so usr/include/player-3.0/libplayerc -usr/lib/pkgconfig/playerc.pc +usr/lib//pkgconfig/playerc.pc usr/share/cmake/Modules/UsePlayerC.cmake usr/lib/player-3.0 diff -Nru player-3.0.2+dfsg/debian/libplayerc++3.0.install player-3.0.2+dfsg/debian/libplayerc++3.0.install --- player-3.0.2+dfsg/debian/libplayerc++3.0.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayerc++3.0.install 2014-09-26 20:31:39.000000000 +0800 @@ -1 +1 @@ -usr/lib/libplayerc++.so.* +usr/lib//libplayerc++.so.* diff -Nru player-3.0.2+dfsg/debian/libplayerc3.0.install player-3.0.2+dfsg/debian/libplayerc3.0.install --- player-3.0.2+dfsg/debian/libplayerc3.0.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayerc3.0.install 2014-09-26 20:31:39.000000000 +0800 @@ -1 +1 @@ -usr/lib/libplayerc.so.* +usr/lib//libplayerc.so.* diff -Nru player-3.0.2+dfsg/debian/libplayercommon3.0-dev.install player-3.0.2+dfsg/debian/libplayercommon3.0-dev.install --- player-3.0.2+dfsg/debian/libplayercommon3.0-dev.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayercommon3.0-dev.install 2014-09-26 20:31:39.000000000 +0800 @@ -1,5 +1,5 @@ usr/include/player-3.0/playerconfig.h usr/include/player-3.0/libplayercommon -usr/lib/libplayercommon.so -usr/lib/pkgconfig/playercommon.pc +usr/lib//libplayercommon.so +usr/lib//pkgconfig/playercommon.pc usr/share/cmake/Modules/PlayerUtils.cmake usr/lib/player-3.0 diff -Nru player-3.0.2+dfsg/debian/libplayercommon3.0.install player-3.0.2+dfsg/debian/libplayercommon3.0.install --- player-3.0.2+dfsg/debian/libplayercommon3.0.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayercommon3.0.install 2014-09-26 20:31:39.000000000 +0800 @@ -1 +1 @@ -usr/lib/libplayercommon.so.* +usr/lib//libplayercommon.so.* diff -Nru player-3.0.2+dfsg/debian/libplayercore3.0-dev.install player-3.0.2+dfsg/debian/libplayercore3.0-dev.install --- player-3.0.2+dfsg/debian/libplayercore3.0-dev.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayercore3.0-dev.install 2014-09-26 20:31:39.000000000 +0800 @@ -1,3 +1,3 @@ -usr/lib/libplayercore.so +usr/lib//libplayercore.so usr/include/player-3.0/libplayercore -usr/lib/pkgconfig/playercore.pc +usr/lib//pkgconfig/playercore.pc diff -Nru player-3.0.2+dfsg/debian/libplayercore3.0.install player-3.0.2+dfsg/debian/libplayercore3.0.install --- player-3.0.2+dfsg/debian/libplayercore3.0.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayercore3.0.install 2014-09-26 20:31:39.000000000 +0800 @@ -1 +1 @@ -usr/lib/libplayercore.so.* +usr/lib//libplayercore.so.* diff -Nru player-3.0.2+dfsg/debian/libplayerdrivers3.0-dev.install player-3.0.2+dfsg/debian/libplayerdrivers3.0-dev.install --- player-3.0.2+dfsg/debian/libplayerdrivers3.0-dev.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayerdrivers3.0-dev.install 2014-09-26 20:31:39.000000000 +0800 @@ -1,3 +1,3 @@ -usr/lib/libplayerdrivers.so -usr/lib/pkgconfig/playerdrivers.pc +usr/lib//libplayerdrivers.so +usr/lib//pkgconfig/playerdrivers.pc usr/include/player-3.0/libplayerdrivers diff -Nru player-3.0.2+dfsg/debian/libplayerdrivers3.0.install player-3.0.2+dfsg/debian/libplayerdrivers3.0.install --- player-3.0.2+dfsg/debian/libplayerdrivers3.0.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayerdrivers3.0.install 2014-09-26 20:31:39.000000000 +0800 @@ -1 +1 @@ -usr/lib/libplayerdrivers.so.* +usr/lib//libplayerdrivers.so.* diff -Nru player-3.0.2+dfsg/debian/libplayerinterface3.0-dev.install player-3.0.2+dfsg/debian/libplayerinterface3.0-dev.install --- player-3.0.2+dfsg/debian/libplayerinterface3.0-dev.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayerinterface3.0-dev.install 2014-09-26 20:31:39.000000000 +0800 @@ -1,5 +1,5 @@ -usr/lib/libplayerinterface.so -usr/lib/pkgconfig/playerinterface.pc +usr/lib//libplayerinterface.so +usr/lib//pkgconfig/playerinterface.pc usr/share/cmake/Modules/UsePlayerPlugin.cmake usr/lib/player-3.0 usr/include/player-3.0/libplayerinterface usr/bin/playerxdrgen diff -Nru player-3.0.2+dfsg/debian/libplayerinterface3.0.install player-3.0.2+dfsg/debian/libplayerinterface3.0.install --- player-3.0.2+dfsg/debian/libplayerinterface3.0.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayerinterface3.0.install 2014-09-26 20:31:39.000000000 +0800 @@ -1 +1 @@ -usr/lib/libplayerinterface.so.* +usr/lib//libplayerinterface.so.* diff -Nru player-3.0.2+dfsg/debian/libplayerjpeg3.0-dev.install player-3.0.2+dfsg/debian/libplayerjpeg3.0-dev.install --- player-3.0.2+dfsg/debian/libplayerjpeg3.0-dev.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayerjpeg3.0-dev.install 2014-09-26 20:31:39.000000000 +0800 @@ -1,2 +1,2 @@ -usr/lib/libplayerjpeg.so +usr/lib//libplayerjpeg.so usr/include/player-3.0/libplayerjpeg diff -Nru player-3.0.2+dfsg/debian/libplayerjpeg3.0.install player-3.0.2+dfsg/debian/libplayerjpeg3.0.install --- player-3.0.2+dfsg/debian/libplayerjpeg3.0.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayerjpeg3.0.install 2014-09-26 20:31:39.000000000 +0800 @@ -1 +1 @@ -usr/lib/libplayerjpeg.so.* +usr/lib//libplayerjpeg.so.* diff -Nru player-3.0.2+dfsg/debian/libplayertcp3.0-dev.install player-3.0.2+dfsg/debian/libplayertcp3.0-dev.install --- player-3.0.2+dfsg/debian/libplayertcp3.0-dev.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayertcp3.0-dev.install 2014-09-26 20:31:39.000000000 +0800 @@ -1,5 +1,5 @@ -usr/lib/libplayertcp.so -usr/lib/libplayerudp.so -usr/lib/pkgconfig/playertcp.pc -usr/lib/pkgconfig/playerudp.pc +usr/lib//libplayertcp.so +usr/lib//libplayerudp.so +usr/lib//pkgconfig/playertcp.pc +usr/lib//pkgconfig/playerudp.pc usr/include/player-3.0/libplayertcp diff -Nru player-3.0.2+dfsg/debian/libplayertcp3.0.install player-3.0.2+dfsg/debian/libplayertcp3.0.install --- player-3.0.2+dfsg/debian/libplayertcp3.0.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayertcp3.0.install 2014-09-26 20:31:39.000000000 +0800 @@ -1,2 +1,2 @@ -usr/lib/libplayertcp.so.* -usr/lib/libplayerudp.so.* +usr/lib//libplayertcp.so.* +usr/lib//libplayerudp.so.* diff -Nru player-3.0.2+dfsg/debian/libplayerwkb3.0-dev.install player-3.0.2+dfsg/debian/libplayerwkb3.0-dev.install --- player-3.0.2+dfsg/debian/libplayerwkb3.0-dev.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayerwkb3.0-dev.install 2014-09-26 20:31:39.000000000 +0800 @@ -1,3 +1,3 @@ -usr/lib/libplayerwkb.so -usr/lib/pkgconfig/playerwkb.pc +usr/lib//libplayerwkb.so +usr/lib//pkgconfig/playerwkb.pc usr/include/player-3.0/libplayerwkb diff -Nru player-3.0.2+dfsg/debian/libplayerwkb3.0.install player-3.0.2+dfsg/debian/libplayerwkb3.0.install --- player-3.0.2+dfsg/debian/libplayerwkb3.0.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libplayerwkb3.0.install 2014-09-26 20:31:39.000000000 +0800 @@ -1 +1 @@ -usr/lib/libplayerwkb.so.* +usr/lib//libplayerwkb.so.* diff -Nru player-3.0.2+dfsg/debian/libpmap3.0-dev.install player-3.0.2+dfsg/debian/libpmap3.0-dev.install --- player-3.0.2+dfsg/debian/libpmap3.0-dev.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libpmap3.0-dev.install 2014-09-26 20:31:39.000000000 +0800 @@ -1,4 +1,4 @@ -usr/lib/libpmap.so +usr/lib//libpmap.so usr/include/player-3.0/libpmap/omap.h usr/include/player-3.0/libpmap/pmap.h usr/include/player-3.0/libpmap/rmap.h diff -Nru player-3.0.2+dfsg/debian/libpmap3.0.install player-3.0.2+dfsg/debian/libpmap3.0.install --- player-3.0.2+dfsg/debian/libpmap3.0.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libpmap3.0.install 2014-09-26 20:31:39.000000000 +0800 @@ -1 +1 @@ -usr/lib/libpmap.so.* +usr/lib//libpmap.so.* diff -Nru player-3.0.2+dfsg/debian/libwavefront-standalone3.0.install player-3.0.2+dfsg/debian/libwavefront-standalone3.0.install --- player-3.0.2+dfsg/debian/libwavefront-standalone3.0.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/libwavefront-standalone3.0.install 2014-09-26 20:31:39.000000000 +0800 @@ -1 +1 @@ -usr/lib/libwavefront_standalone.so.* +usr/lib//libwavefront_standalone.so.* diff -Nru player-3.0.2+dfsg/debian/patches/0010-fix-ftbfs-libstatgrab0.90.patch player-3.0.2+dfsg/debian/patches/0010-fix-ftbfs-libstatgrab0.90.patch --- player-3.0.2+dfsg/debian/patches/0010-fix-ftbfs-libstatgrab0.90.patch 1970-01-01 08:00:00.000000000 +0800 +++ player-3.0.2+dfsg/debian/patches/0010-fix-ftbfs-libstatgrab0.90.patch 2014-09-26 18:30:08.000000000 +0800 @@ -0,0 +1,48 @@ +Description: Fix for API changes of libstatgrab version 0.90 +Author: Peter Michael Green <plugw...@raspbian.org> +Bug-Debian: http://bugs.debian.org/735572 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- player-3.0.2+dfsg.orig/server/drivers/health/statgrab/statgrab_health.cpp ++++ player-3.0.2+dfsg/server/drivers/health/statgrab/statgrab_health.cpp +@@ -130,7 +130,7 @@ StatGrabDriver::StatGrabDriver(ConfigFil + int StatGrabDriver::MainSetup() + { + // Initialise statgrab +- sg_init(); ++ sg_init(1); + /* Drop setuid/setgid privileges. */ + if (sg_drop_privileges() != 0) + { +@@ -171,7 +171,7 @@ void StatGrabDriver::RefreshData() + //double receivedCpu; + float cpuIdle, cpuServer, cpuUser ; + //CPU +- cpu_percent = sg_get_cpu_percents(); ++ cpu_percent = sg_get_cpu_percents(NULL); + + cpuIdle = cpu_percent->idle; + mHealth.cpu_usage.idle = cpuIdle; +@@ -183,8 +183,8 @@ void StatGrabDriver::RefreshData() + + + //Virtual Memory +- mem_data = sg_get_mem_stats(); +- swap_stats = sg_get_swap_stats(); ++ mem_data = sg_get_mem_stats(NULL); ++ swap_stats = sg_get_swap_stats(NULL); + + mHealth.mem.total = mem_data->total; + mHealth.mem.used = mem_data->used; diff -Nru player-3.0.2+dfsg/debian/patches/series player-3.0.2+dfsg/debian/patches/series --- player-3.0.2+dfsg/debian/patches/series 2013-09-06 14:15:16.000000000 +0800 +++ player-3.0.2+dfsg/debian/patches/series 2014-09-26 18:30:08.000000000 +0800 @@ -8,3 +8,4 @@ 0008-Update-for-new-libgeos-FTBFS.patch 0009-Fix-zlib-1.2.6-FTBFS.patch boost1.54 +0010-fix-ftbfs-libstatgrab0.90.patch diff -Nru player-3.0.2+dfsg/debian/ruby-playerc.install player-3.0.2+dfsg/debian/ruby-playerc.install --- player-3.0.2+dfsg/debian/ruby-playerc.install 2012-03-26 07:17:30.000000000 +0800 +++ player-3.0.2+dfsg/debian/ruby-playerc.install 2014-09-26 20:32:08.000000000 +0800 @@ -1 +1 @@ -usr/lib/site_ruby +usr/lib/*/site_ruby
