conda-forge · traversaro · Apr 2, 2021 · Apr 2, 2021 · Apr 2, 2021 · Apr 2, 2021
diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -29,5 +29,3 @@ qt:
 - '5.12'
 target_platform:
 - win-64
-tbb_devel:
-- '2020'
diff --git a/recipe/2906.patch b/recipe/2906.patch
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -17,6 +17,7 @@ cmake ^
     -DTBB_INCLUDEDIR=%LIBRARY_PREFIX%\include ^
     -DTBB_LIBRARY_DIR=%LIBRARY_PREFIX%\lib ^
     -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON ^
+    -DHAVE_OPENAL:BOOL=OFF ^
     %SRC_DIR%
 if errorlevel 1 exit 1
 

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -8,7 +8,8 @@ cmake .. \
       -DCMAKE_INSTALL_PREFIX=$PREFIX \
       -DCMAKE_INSTALL_LIBDIR=lib \
       -DBoost_NO_BOOST_CMAKE=OFF \
-      -DBoost_DEBUG=OFF
+      -DBoost_DEBUG=OFF \
+      -DHAVE_OPENAL:BOOL=OFF 
 
 cmake --build . --config $BUILD_TYPE -- -j$CPU_COUNT
 cmake --build . --config $BUILD_TYPE --target install

diff --git a/recipe/cmake_129_workaround.patch b/recipe/cmake_129_workaround.patch
diff --git a/recipe/disable-openal.patch b/recipe/disable-openal.patch
diff --git a/recipe/fix_boost_include.patch b/recipe/fix_boost_include.patch
diff --git a/recipe/fix_build.patch b/recipe/fix_build.patch
@@ -1,16 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7322874cdc..4fc5c596c1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -283,7 +283,7 @@ endif()
-
- # Visual Studio enables c++11 support by default
- if (NOT MSVC)
--  set(UNFILTERED_FLAGS "-std=c++11")
-+  set(UNFILTERED_FLAGS "-std=c++17")
- endif()
-
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VALID_CXX_FLAGS} ${UNFILTERED_FLAGS}")
 diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
 index 2b79fd4be3..d55e8ce8e3 100644
 --- a/cmake/SearchForStuff.cmake
@@ -79,15 +66,3 @@ index 4fa403cfde..b571840557 100644
  if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND
      "${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
 
-diff --git a/plugins/rest_web/RestApi.cc b/plugins/rest_web/RestApi.cc
-index 06790ae3b5..0f5cd85a90 100644
---- a/plugins/rest_web/RestApi.cc
-+++ b/plugins/rest_web/RestApi.cc
-@@ -18,7 +18,7 @@
- #include <cstring>
- #include <stdlib.h>
- #include <curl/curl.h>
--#include <inttypes.h>
-+#include <cinttypes>
-
- #include "RestApi.hh"
diff --git a/recipe/link_openal.patch b/recipe/link_openal.patch
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,23 +1,20 @@
 {% set name = "gazebo" %}
-{% set version = "11.3.0" %}
+{% set version = "11.4.0" %}
 
 package:
   name: {{ name }}
   version: {{ version }}
 
 source:
   - url: https://github.com/osrf/{{ name }}/archive/{{ name }}{{ version.split('.')[0] }}_{{ version }}.tar.gz
-    sha256: b3c14fc1a123be2992b880efa11d362d3d06c77d8c9624a14c487357ec7623f1
+    sha256: 7ea73e73115a27092ed502351c00ef43413ffc0cf53970a49605dabf5b3c0c62
     patches:
       - fix_build.patch  # [unix]
       - use-external-libs-config.patch
       - normalize-ogre-path.patch
-      - cmake_129_workaround.patch  # [unix]
-      - 2906.patch
-      - disable-openal.patch
 
 build:
-  number: 11
+  number: 0
   skip: false
   run_exports:
     - {{ pin_subpackage('gazebo', max_pin='x') }}
@@ -58,7 +55,7 @@ requirements:
     - libignition-cmake2
     - libignition-math6
     - libignition-transport8
-    - libignition-common3 
+    - libignition-common3
     - libignition-fuel-tools4
     - qt
     - ogre 1.10.*

diff --git a/recipe/qwt-fix.patch b/recipe/qwt-fix.patch
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,5 +29,3 @@ qt: @@
     - '5.12'
     target_platform:
     - win-64
-    tbb_devel:
-    - '2020'