Rebuild for Raspbian Wheezy

debian/changelog

@@ -1,3 +1,9 @@
+moonlight-embedded (2.2.0-1wheezy1) RELEASED; urgency=high
+
+  * Rebuild for Raspbian Wheezy
+
+ -- Iwan Timmer <irtimmer@gmail.com>  Tue, 3 Apr 2016 14:44:20 +0200
+
 moonlight-embedded (2.2.0-1jessie1) RELEASED; urgency=high
 
   * Update to version 2.2.0

debian/patches/enet.patch

@@ -0,0 +1,14 @@
+Index: moonlight-embedded-debian/third_party/moonlight-common-c/src/ControlStream.c
+===================================================================
+--- moonlight-embedded-debian.orig/third_party/moonlight-common-c/src/ControlStream.c
++++ moonlight-embedded-debian/third_party/moonlight-common-c/src/ControlStream.c
+@@ -654,9 +654,6 @@ int startControlStream(void) {
+ 
+         // Ensure the connect verify ACK is sent immediately
+         enet_host_flush(client);
+-        
+-        // Set the max peer timeout to 10 seconds
+-        enet_peer_timeout(peer, ENET_PEER_TIMEOUT_LIMIT, ENET_PEER_TIMEOUT_MINIMUM, 10000);
+     }
+     else {
+         ctlSock = connectTcpSocket(&RemoteAddr, RemoteAddrLen,

debian/patches/install.patch

@@ -1,5 +1,5 @@
 Compile using older version (2.8) of CMake
-Index: moonlight-embedded/CMakeLists.txt
+Index: moonlight-embedded-debian/CMakeLists.txt
 ===================================================================
 --- moonlight-embedded-debian.orig/CMakeLists.txt
 +++ moonlight-embedded-debian/CMakeLists.txt
@@ -25,16 +25,25 @@ Index: moonlight-embedded/CMakeLists.txt
    target_link_libraries(moonlight ${CEC_LIBRARIES})
  endif()
  
-@@ -95,7 +95,7 @@ if(BROADCOM_FOUND)
+@@ -95,7 +95,7 @@ if(AMLOGIC_FOUND)
+   list(APPEND MOONLIGHT_DEFINITIONS HAVE_AML)
+   list(APPEND MOONLIGHT_OPTIONS AML)
+   add_library(moonlight-aml SHARED ./src/video/aml.c ${ILCLIENT_SRC_LIST})
+-  target_include_directories(moonlight-aml PRIVATE ${AMLOGIC_INCLUDE_DIRS} ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR})
++  include_directories(${AMLOGIC_INCLUDE_DIRS} ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR})
+   target_link_libraries(moonlight-aml gamestream ${AMLOGIC_LIBRARIES})
+   set_property(TARGET moonlight-aml PROPERTY COMPILE_DEFINITIONS ${AMLOGIC_DEFINITIONS})
+   install(TARGETS moonlight-aml DESTINATION ${CMAKE_INSTALL_LIBDIR})
+@@ -106,7 +106,7 @@ if(BROADCOM_FOUND)
    list(APPEND MOONLIGHT_OPTIONS PI)
    aux_source_directory(./third_party/ilclient ILCLIENT_SRC_LIST)
-   add_library(moonlight-pi SHARED ./src/video/pi.c ${ILCLIENT_SRC_LIST})
+   add_library(moonlight-pi SHARED ./src/video/pi.c ./src/audio/omx.c ${ILCLIENT_SRC_LIST})
--  target_include_directories(moonlight-pi PRIVATE ./third_party/ilclient ${BROADCOM_INCLUDE_DIRS} ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR})
+-  target_include_directories(moonlight-pi PRIVATE ./third_party/ilclient ${BROADCOM_INCLUDE_DIRS} ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR} ${OPUS_INCLUDE_DIRS})
-+  include_directories(./third_party/ilclient ${BROADCOM_INCLUDE_DIRS})
++  include_directories(./third_party/ilclient ${BROADCOM_INCLUDE_DIRS} ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR} ${OPUS_INCLUDE_DIRS})
-   target_link_libraries(moonlight-pi gamestream ${BROADCOM_LIBRARIES})
+   target_link_libraries(moonlight-pi gamestream ${BROADCOM_LIBRARIES} ${OPUS_LIBRARY})
    set_property(TARGET moonlight-pi PROPERTY COMPILE_DEFINITIONS ${BROADCOM_DEFINITIONS})
    install(TARGETS moonlight-pi DESTINATION ${CMAKE_INSTALL_LIBDIR})
-@@ -105,29 +105,29 @@ if(FREESCALE_FOUND)
+@@ -116,29 +116,29 @@ if(FREESCALE_FOUND)
    list(APPEND MOONLIGHT_DEFINITIONS HAVE_IMX)
    list(APPEND MOONLIGHT_OPTIONS IMX)
    add_library(moonlight-imx SHARED ./src/video/imx.c)
@@ -69,11 +78,11 @@ Index: moonlight-embedded/CMakeLists.txt
  target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${ALSA_LIBRARY} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS})
  
  add_subdirectory(docs)
-Index: moonlight-embedded/libgamestream/CMakeLists.txt
+Index: moonlight-embedded-debian/libgamestream/CMakeLists.txt
 ===================================================================
---- moonlight-embedded.orig/libgamestream/CMakeLists.txt
+--- moonlight-embedded-debian.orig/libgamestream/CMakeLists.txt
-+++ moonlight-embedded/libgamestream/CMakeLists.txt
++++ moonlight-embedded-debian/libgamestream/CMakeLists.txt
-@@ -15,13 +15,13 @@ aux_source_directory(../third_party/moon
+@@ -15,14 +15,14 @@ aux_source_directory(../third_party/moon
  add_library(moonlight-common SHARED ${MOONLIGHT_COMMON_SRC_LIST})
  
  add_library(gamestream SHARED ${GAMESTREAM_SRC_LIST})
@@ -84,8 +93,10 @@ Index: moonlight-embedded/libgamestream/CMakeLists.txt
  set_target_properties(gamestream PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION})
  set_target_properties(moonlight-common PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION})
  
--target_include_directories(gamestream PRIVATE ../third_party/moonlight-common-c ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS})
+-target_include_directories(gamestream PRIVATE ../third_party/moonlight-common-c/src ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS})
-+include_directories(../third_party/moonlight-common-c ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS})
+-target_include_directories(moonlight-common PRIVATE  ${ENET_INCLUDE_DIRS})
++include_directories(../third_party/moonlight-common-c/src ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS})
++include_directories(${ENET_INCLUDE_DIRS})
  target_link_libraries(gamestream ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${AVAHI_LIBRARIES} ${LIBUUID_LIBRARIES})
+ target_link_libraries(moonlight-common ${ENET_LIBRARIES})
  
- target_link_libraries(gamestream ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})

debian/patches/series

@@ -1 +1,2 @@
+enet.patch
 install.patch