am7xxx-play: don't override return value when there is a usable one

[libam7xxx.git] / HACKING.asciidoc

diff --git a/HACKING.asciidoc b/HACKING.asciidoc
index 00ca2d8..61ca389 100644 (file)
--- a/HACKING.asciidoc
+++ b/HACKING.asciidoc
@@ -17,7 +17,8 @@ On a Debian based system, the dependencies can be installed with this command:
                           libavformat-dev \
                           libavcodec-dev \
                           libavdevice-dev \
                           libavformat-dev \
                           libavcodec-dev \
                           libavdevice-dev \

-                          libswscale-dev
+                          libswscale-dev \
+                          libxcb1-dev

 
 With libav/ffmpeg version previous than 0.9 this patch is needed:
 http://git.ao2.it/libam7xxx.git/blob_plain/refs/heads/debian:/debian/patches/0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch
 
 With libav/ffmpeg version previous than 0.9 this patch is needed:
 http://git.ao2.it/libam7xxx.git/blob_plain/refs/heads/debian:/debian/patches/0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch


@@ -64,17 +65,17 @@ If you want to build for MS Windows:
   $ sudo aptitude install mingw-w64
   $ mkdir build
   $ cd build
   $ sudo aptitude install mingw-w64
   $ mkdir build
   $ cd build

-  $ wget -nv http://sourceforge.net/projects/libusbx/files/releases/1.0.11/Windows/libusbx-1.0.11-win.7z
-  $ 7z -olibusbx-1.0.11-win x libusbx-1.0.11-win.7z
-  $ wget -nv http://win32.libav.org/win32/libav-win32-20120521.7z
-  $ 7z x libav-win32-20120521.7z
+  $ wget -nv https://github.com/libusb/libusb/releases/download/v1.0.21/libusb-1.0.21.7z
+  $ 7z -olibusb-1.0.21 x libusb-1.0.21.7z
+  $ wget -nv https://ffmpeg.zeranoe.com/builds/win32/dev/ffmpeg-3.4.2-win32-dev.zip
+  $ unzip ffmpeg-3.4.2-win32-dev.zip

   $ cmake  \
           -D GNU_HOST=i686-w64-mingw32 \
           -D CMAKE_TOOLCHAIN_FILE=../cmake_modules/mingw_cross_toolchain.cmake \
           -D CMAKE_INSTALL_PREFIX=libam7xxx-win/ \
   $ cmake  \
           -D GNU_HOST=i686-w64-mingw32 \
           -D CMAKE_TOOLCHAIN_FILE=../cmake_modules/mingw_cross_toolchain.cmake \
           -D CMAKE_INSTALL_PREFIX=libam7xxx-win/ \

-          -D LIBUSB_1_INCLUDE_DIR=libusbx-1.0.11-win/include/libusbx-1.0 \
-          -D LIBUSB_1_LIBRARY=libusbx-1.0.11-win/MinGW32/dll/libusb-1.0.dll \
-          -D FFMPEG_ROOT=$(pwd)/libav-win32-20120521/usr \
+          -D LIBUSB_1_INCLUDE_DIR=libusb-1.0.21/include/libusb-1.0 \
+          -D LIBUSB_1_LIBRARY=libusb-1.0.21/MinGW32/dll/libusb-1.0.dll \
+          -D FFMPEG_ROOT=$(pwd)/ffmpeg-3.4.2-win32-dev \

           ../
   $ make
 
           ../
   $ make