completely remove sdl

C++/CMakeLists.txt

@@ -73,8 +73,6 @@ set(LIBRARIES
     iw
     udev
     tar
-    SDL
-    SDL_image
     ${ImageMagick_LIBRARIES}
     ${ZLIB_LIBRARIES}
     drm

C++/FrameBuffer.cpp

@@ -1,5 +1,5 @@
 //  File:   FrameBuffer.cpp
-//  Encapsulates access to frame buffer through SDL, providing interface to
+//  Encapsulates access to frame buffer through DRM, providing interface to
 //  video hardware
 //
 //  This file is part of the Ember firmware.

C++/PrintDataZip.cpp

@@ -21,7 +21,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-#include <SDL/SDL_image.h>
 #include <sstream>
 
 #include <Logger.h>

C++/include/FrameBuffer.h

@@ -1,5 +1,5 @@
 //  File:   FrameBuffer.h
-//  Encapsulates access to frame buffer through SDL, providing interface to
+//  Encapsulates access to frame buffer through DRM, providing interface to
 //  video hardware
 //
 //  This file is part of the Ember firmware.

C++/main.cpp

@@ -64,9 +64,6 @@ int main(int argc, char** argv)
     try
     {
         // sets up signal handling
-        // must set up signal handling before constructing projector since SDL
-        // initialization somehow causes the process to receive SIGHUP, which
-        // by default causes termination
         Signals signals;
 
         Magick::InitializeMagick("");

C++/utils.cpp

@@ -42,8 +42,6 @@
 #include <sys/mount.h>
 #include <ftw.h>
 
-#include <SDL/SDL.h>
-
 #define RAPIDJSON_ASSERT(x)                         \
   if (x);                                            \
   else throw std::exception();  

Utilities/zee/nbproject/Makefile-Debug.mk

@@ -68,7 +68,7 @@ LDLIBSOPTIONS=
 
 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/zee: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/zee ${OBJECTFILES} ${LDLIBSOPTIONS} -lrt -lSDL -lSDL_image -ltar -lz -liw
+	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/zee ${OBJECTFILES} ${LDLIBSOPTIONS} -lrt -ltar -lz -liw
 
 ${OBJECTDIR}/_ext/56246743/I2C_Device.o: ../../C++/I2C_Device.cpp 
 	${MKDIR} -p ${OBJECTDIR}/_ext/56246743

Utilities/zee/nbproject/Makefile-Release.mk

@@ -68,7 +68,7 @@ LDLIBSOPTIONS=
 
 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/zee: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/zee ${OBJECTFILES} ${LDLIBSOPTIONS} -lrt -lSDL -lSDL_image -ltar -lz -liw
+	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/zee ${OBJECTFILES} ${LDLIBSOPTIONS} -lrt -ltar -lz -liw
 
 ${OBJECTDIR}/_ext/56246743/I2C_Device.o: ../../C++/I2C_Device.cpp 
 	${MKDIR} -p ${OBJECTDIR}/_ext/56246743

Utilities/zee/nbproject/configurations.xml

@@ -54,7 +54,7 @@
           </preprocessorList>
         </ccTool>
         <linkerTool>
-          <commandLine>-lrt -lSDL -lSDL_image -ltar -lz -liw</commandLine>
+          <commandLine>-lrt -ltar -lz -liw</commandLine>
         </linkerTool>
       </compileType>
       <item path="../../C++/I2C_Device.cpp" ex="false" tool="1" flavor2="0">
@@ -100,7 +100,7 @@
           <developmentMode>5</developmentMode>
         </asmTool>
         <linkerTool>
-          <commandLine>-lrt -lSDL -lSDL_image -ltar -lz -liw</commandLine>
+          <commandLine>-lrt -ltar -lz -liw</commandLine>
         </linkerTool>
       </compileType>
       <item path="../../C++/I2C_Device.cpp" ex="false" tool="1" flavor2="0">

deploy/configs/smith-common.conf

@@ -28,23 +28,23 @@ deb_arch="armhf"
 # ruby : provides ruby 2.1 compatible ruby interpreter
 # libtar0 : provides library for manipulating tar archives
 # zlib1g : deflate gzip compressed files
-# libsdl-image1.2 : graphical image display library
 # libfuse2 : userspace filesystem libraries, required by owfs
 # resolvconf : intermediary between programs that supply DNS hosts and the programs that use this information, workaround for read-only /etc/resolv.conf
 # libiw30 : needed for determining if wlan is in access point mode
 # libmagick++-6.q16-5 : needed for manipulating slice images
 # owfs-fuse : 1wire file system
 # dbus : needed by wpasupplicant; since the dbus package is not a hard dependency of wpasupplicant, specify here to ensure inclusion with release file system
 # i2c-tools : used for diagnostics/testing of I2C device communication
+# libdrm2 : used to interface with video output
 
 # These packages are installed with debootstrap
 common_deb_include="ca-certificates git-core openssh-server systemd sudo"
 
 # These packages are installed directly with apt-get
 # Most packages should be added here
 common_deb_additional_pkgs="cpufrequtils wpasupplicant dnsmasq wireless-tools ifplugd \
-ruby libtar0 zlib1g libsdl-image1.2 libfuse2 resolvconf libiw30 libmagick++-6.q16-5 \
-owfs-fuse dbus i2c-tools"
+ruby libtar0 zlib1g libfuse2 resolvconf libiw30 libmagick++-6.q16-5 \
+owfs-fuse dbus i2c-tools libdrm2"
 
 deb_components="main contrib non-free"
 

deploy/configs/smith-development.conf

@@ -26,8 +26,8 @@ deb_include="${common_deb_include} dosfstools initramfs-tools linux-base locales
 # Most packages should be added here
 deb_additional_pkgs="${common_deb_additional_pkgs} nano file bsdmainutils fbset hexedit read-edid usbutils \
 lshw autoconf automake build-essential libtool less g++ gdb pkg-config vim curl tree screen ruby-dev unzip \
-libboost-dev libtar-dev libsdl-image1.2-dev libfuse-dev squashfs-tools iotop bc libssl-dev zip python-pip libiw-dev \
-libmagick++-6.q16-dev libudev-dev cmake cmake-curses-gui lcov busybox"
+libboost-dev libtar-dev libfuse-dev squashfs-tools iotop bc libssl-dev zip python-pip libiw-dev \
+libmagick++-6.q16-dev libudev-dev cmake cmake-curses-gui lcov busybox libdrm-dev"
 
 deb_exclude=""