trying to get appimage back

.travis.yml

@@ -0,0 +1,76 @@
+language: c++
+compiler: gcc
+sudo: require
+dist: trusty
+
+before_install:
+    - sudo add-apt-repository ppa:beineri/opt-qt532-trusty -y
+    - sudo apt-get update -qq
+
+install: 
+  -  sudo apt-get install qt4-qmake build-essential g++
+  -  sudo apt-get install libsndfile1-dev qt4-default libfftw3-dev portaudio19-dev 
+  -  sudo apt-get install zlib1g-dev libusb-1.0-0-dev mesa-common-dev
+  - sudo apt-get install libgl1-mesa-dev libqt4-opengl-dev libsamplerate-dev libqwt-dev
+
+  - sudo apt-get install libtool
+  - sudo apt-get install autoconf
+
+  - tar zxvf faad2-2.8.8.tar.gz
+  - cd faad2-2.8.8
+  - ./configure 
+  - make
+  - sudo make install
+  - sudo ldconfig
+  - cd ..
+  - rm -rf faad2-2.8.8
+
+  - tar zxvf rtl-sdr.tgz
+  - cd rtl-sdr
+  - mkdir build
+  - cd build
+  - cmake .. -DINSTALL_UDEV_RULES=ON -DDETACH_KERNEL_DRIVER=ON
+  - make
+  - sudo make install
+  - rm -rf rtl-sdr
+
+  - tar zxvf hackrf.tgz
+  - cd host
+  - mkdir build
+  - cd build
+  - cmake .. -DINSTALL_UDEV_RULES=ON
+  - make
+  - sudo make install
+  - rm -rf host
+
+  - cp CMakeLists.txt-qt4 CMakeLists.txt
+  - cmake . -DCMAKE_INSTALL_PREFIX=/usr
+  - make -j4
+  - ls -lh .
+  - mkdir -p appdir/usr/bin 
+  - cp swradio-8 appdir/usr/bin/swradio-8 
+  - mkdir -p appdir/usr/lib
+  - mkdir -p appdir/usr/share/applications ; cp swradio.desktop appdir/usr/share/applications
+  - cp swradio.png appdir/qt-dab.png
+  - touch appdir/swradio.png # Dear upstream developers, please provide an application icon
+  - ls -l appdir/usr/lib
+  - # after_success:
+  - ls -l
+  - ls -l appdir
+  - ls -l appdir/usr
+  - ls -l appimage
+  - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" 
+  - chmod a+x linuxdeployqt*.AppImage
+  - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
+  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs
+  - # Workaround for https://github.com/probonopd/linuxdeployqt/issues/31#issuecomment-289267637
+  - ./linuxdeployqt*.AppImage --appimage-extract
+#  - find appdir/usr/plugins/ -type f -exec squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/../../lib' {} \;
+  - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/* -bundle-non-qt-libs
+  - chmod a+x appimage/* ; rm appdir/AppRun ; cp appimage/* appdir/
+  - export PATH=squashfs-root/usr/bin/:$PATH # Make it pick up our private patched mksquashfs; https://github.com/plougher/squashfs-tools/pull/13/files
+  - squashfs-root/usr/bin/appimagetool $(readlink -f ./appdir/)
+  - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+  - curl --upload-file ./swradio*.AppImage https://transfer.sh/swradio-8.$(git rev-parse --short HEAD)-x86_64.AppImage
+  - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+  - bash ./upload.sh ./swradio*.AppImage

CMakeLists.txt-qt4

@@ -109,11 +109,11 @@ list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
 	   set (extraLibs ${extraLibs} ${PTHREADS})
 	endif (NOT(PTHREADS))
 
-        find_package(Faad)
+        find_package(FaadDRM)
         if (NOT FAAD_FOUND )
-            message(FATAL_ERROR "please install libfaad")
+            message(FATAL_ERROR "please install libfaad_drm")
         endif ()
-        list(APPEND extraLibs ${LIBFAAD_drm_LIBRARY})
+        list(APPEND extraLibs ${FAAD_LIBRARY})
 
 
 #######################################################################
@@ -419,7 +419,6 @@ list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
 	          ${QT_QTGUI_INCLUDE_DIR}
 	          ${FFTW_INCLUDE_DIRS}
 	          ${PORTAUDIO_INCLUDE_DIRS}
-	          ${FAAD_INCLUDE_DIRS}
 	          ${SNDFILES_INCLUDE_DIRS}
 	)
 

README.md

@@ -224,11 +224,13 @@ following steps.
 
    ```
    cd ./swradio-8
-   cd faad2-2.8
+   tar zxvf faad2-2.8.8
+   cd faad2-2.8.8
    ./configure
    make
    sudo make install
    cd ..
+   rm -rf faad2-2.8.8
    ```
 
 4. Device support
@@ -266,12 +268,14 @@ and to comment out the lines
 
   c) To make life easy, the sources for the required rtlsdr library used are included in the source tree
   ```
+   tar zxvf rtl-sdr.tgz
    cd rtl-sdr/
    mkdir build
    cd build
    cmake ../ -DINSTALL_UDEV_RULES=ON -DDETACH_KERNEL_DRIVER=ON
    make
    sudo make install
+   rm -rf rtl-sdr
    sudo ldconfig
    cd ..
    rm -rf build

appimage/AppRun

@@ -1,5 +1,7 @@
 #!/bin/bash
 HERE="$(dirname "$(readlink -f "${0}")")"
+cp "${HERE}/udev-rules-helper" /tmp/
+# Try to run using sudo, if this does not work ask the user for password
+sudo -n -E -- "/tmp/udev-rules-helper" || pkexec "/tmp/udev-rules-helper"
+rm "/tmp/udev-rules-helper"
 exec "${HERE}/usr/bin/swradio-8" "$@"
-~                                                                               
-~                                                             

appimage/udev-rules-helper

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+HERE="$(dirname "$(readlink -f "${0}")")"
+
+rmmod dvb_usb_rtl28xxu || true
+
+cat > /tmp/10-rtl-sdr.rules <<\EOF
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2832", MODE="0666", SYMLINK+="rtl_sdr"
+EOF
+
+mv /tmp/10-rtl-sdr.rules /etc/udev/rules.d/10-rtl-sdr.rules
+
+cat > /tmp/53-hackrf.rules <<\EOF
+# HackRF Jawbreaker
+ATTR{idVendor}=="1d50", ATTR{idProduct}=="604b", SYMLINK+="hackrf-jawbreaker-%k", MODE="660"
+# HackRF One
+ATTR{idVendor}=="1d50", ATTR{idProduct}=="6089", SYMLINK+="hackrf-one-%k", MODE="660"
+# rad1o
+ATTR{idVendor}=="1d50", ATTR{idProduct}=="cc15", SYMLINK+="rad1o-%k", MODE="660"
+# NXP Semiconductors DFU mode (HackRF and rad1o)
+ATTR{idVendor}=="1fc9", ATTR{idProduct}=="000c", SYMLINK+="nxp-dfu-%k", MODE="660"
+# rad1o "full flash" mode
+KERNEL=="sd?", SUBSYSTEM=="block", ENV{ID_VENDOR_ID}=="1fc9", ENV{ID_MODEL_ID}=="0042", SYMLINK+="rad1o-flash-%k", MODE="660"
+# rad1o flash disk
+KERNEL=="sd?", SUBSYSTEM=="block", ENV{ID_VENDOR_ID}=="1fc9", ENV{ID_MODEL_ID}=="0082", SYMLINK+="rad1o-msc-%k", MODE="660"
+EOF
+
+mv /tmp/53-hackrf.rules /etc/udev/rules.d/53-hackrf.rules
+
+cat > /tmp/66-mirics.rules <<\EOF
+SUBSYSTEM=="usb",ENV{DEVTYPE}=="usb_device",ATTRS{idVendor}=="1df7",ATTRS{idProduct}=="2500",MODE:="0666"
+SUBSYSTEM=="usb",ENV{DEVTYPE}=="usb_device",ATTRS{idVendor}=="1df7",ATTRS{idProduct}=="3010",MODE:="0666"
+SUBSYSTEM=="usb",ENV{DEVTYPE}=="usb_device",ATTRS{idVendor}=="1df7",ATTRS{idProduct}=="3000",MODE:="0666"
+EOF
+
+mv /tmp/66-mirics.rules /etc/udev/rules.d/66-mirics.rules
+
+udevadm control --reload-rules
+udevadm trigger --attr-match=subsystem=usb