gdal: update patches and shorten conditionals