pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
-lightspark
Module Name: pkgsrc-wip
Committed By: nia <nia%netbsd.org@localhost>
Pushed By: nee
Date: Wed Jul 17 00:42:33 2019 +0100
Changeset: 21f085ebf4838a272ada6f912324cbc47caeb47c
Modified Files:
Makefile
Removed Files:
lightspark/DESCR
lightspark/Makefile
lightspark/PLIST
lightspark/TODO
lightspark/distinfo
lightspark/patches/patch-CMakeLists.txt
lightspark/patches/patch-src_CMakeLists.txt
lightspark/patches/patch-src_allclasses.cpp
lightspark/patches/patch-src_backends_geometry.h
lightspark/patches/patch-src_backends_graphics.h
lightspark/patches/patch-src_backends_interfaces_audio_pulse_CMakeLists.txt
lightspark/patches/patch-src_backends_pluginmanager.cpp
lightspark/patches/patch-src_compat.cpp
lightspark/patches/patch-src_main.cpp
lightspark/patches/patch-src_parsing_streams.h
lightspark/patches/patch-src_parsing_tags__stub.cpp
lightspark/patches/patch-src_plugin_CMakeLists.txt
lightspark/patches/patch-src_scripting_abc.cpp
lightspark/patches/patch-src_scripting_abc.h
lightspark/patches/patch-src_scripting_abc__codesynt.cpp
lightspark/patches/patch-src_scripting_class.h
lightspark/patches/patch-src_scripting_flash_utils_flashutils.h
Log Message:
-lightspark
The version in HEAD is newer.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=21f085ebf4838a272ada6f912324cbc47caeb47c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
lightspark/DESCR | 3 -
lightspark/Makefile | 59 --------------
lightspark/PLIST | 29 -------
lightspark/TODO | 3 -
lightspark/distinfo | 22 ------
lightspark/patches/patch-CMakeLists.txt | 89 ----------------------
lightspark/patches/patch-src_CMakeLists.txt | 54 -------------
lightspark/patches/patch-src_allclasses.cpp | 21 -----
lightspark/patches/patch-src_backends_geometry.h | 15 ----
lightspark/patches/patch-src_backends_graphics.h | 30 --------
..._backends_interfaces_audio_pulse_CMakeLists.txt | 14 ----
.../patches/patch-src_backends_pluginmanager.cpp | 21 -----
lightspark/patches/patch-src_compat.cpp | 24 ------
lightspark/patches/patch-src_main.cpp | 16 ----
lightspark/patches/patch-src_parsing_streams.h | 20 -----
.../patches/patch-src_parsing_tags__stub.cpp | 15 ----
lightspark/patches/patch-src_plugin_CMakeLists.txt | 14 ----
lightspark/patches/patch-src_scripting_abc.cpp | 76 ------------------
lightspark/patches/patch-src_scripting_abc.h | 28 -------
.../patches/patch-src_scripting_abc__codesynt.cpp | 58 --------------
lightspark/patches/patch-src_scripting_class.h | 22 ------
.../patch-src_scripting_flash_utils_flashutils.h | 17 -----
23 files changed, 651 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index cf31550e8e..b7a9fd346c 100644
--- a/Makefile
+++ b/Makefile
@@ -2042,7 +2042,6 @@ SUBDIR+= lie
SUBDIR+= light-desktop
SUBDIR+= lightdm
SUBDIR+= lightdm-gtk-greeter
-SUBDIR+= lightspark
SUBDIR+= lilypond-git
SUBDIR+= lilyterm
SUBDIR+= linbox
diff --git a/lightspark/DESCR b/lightspark/DESCR
deleted file mode 100644
index ce11cefbaf..0000000000
--- a/lightspark/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Lightspark is an LGPLv3 licensed Flash player and browser plugin
-written in C++/C that runs on Linux. It aims to support
-Adobe's newer Flash formats and AVM2 virtual machine.
diff --git a/lightspark/Makefile b/lightspark/Makefile
deleted file mode 100644
index 8e477f89c7..0000000000
--- a/lightspark/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2015/03/04 19:48:16 tnn2 Exp $
-
-DISTNAME= lightspark-0.7.2
-CATEGORIES= multimedia
-MASTER_SITES= https://launchpad.net/lightspark/trunk/lightspark-0.7.2/+download/
-
-MAINTAINER= nathanialsloss%yahoo.com.au@localhost
-LICENSE= gnu-gpl-v3
-HOMEPAGE= https://launchpad.net/lightspark/
-COMMENT= GPL AMV2 Flash player and plugin
-
-DEPENDS+= xdg-utils>=1.0:../../misc/xdg-utils
-
-USE_LANGUAGES= c c++
-USE_CMAKE= yes
-USE_TOOLS+= pkg-config
-GCC_REQD+= 4.6
-AUTO_MKDIRS= yes
-EGDIR= ${PREFIX}/share/examples/lightspark
-CMAKE_ARGS+= -DGNASH_EXE_PATH:STRING="${PREFIX}/bin/gnash"
-
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+= -stdlib=libc++
-CXXFLAGS+= -std=c++0x
-.endif
-
-pre-configure:
- ${LN} -s ${LLVM_CONFIG_PATH} ${TOOLS_DIR}/bin/llvm-config
-
-post-install:
- ${MV} ${DESTDIR}${PREFIX}/etc/xdg ${DESTDIR}${EGDIR} && \
- ${RMDIR} ${DESTDIR}${PREFIX}/etc
-
-CONF_FILES= ${EGDIR}/xdg/lightspark.conf ${PKG_SYSCONFDIR}/xdg/lightspark.conf
-
-DEPENDS+= gnash>=0.8.10:../../multimedia/gnash
-BUILD_DEPENDS+= nasm>=2.10:../../devel/nasm
-BUILDLINK_API_DEPENDS.xz+= xz>=5.0.5
-.include "../../archivers/xz/buildlink3.mk"
-.include "../../audio/pulseaudio/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/glibmm/buildlink3.mk"
-.include "../../graphics/glew/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../lang/libLLVM34/buildlink3.mk"
-.include "../../multimedia/ffmpeg010/buildlink3.mk"
-.include "../../net/rtmpdump/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/libxml++/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../lang/compiler-rt/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lightspark/PLIST b/lightspark/PLIST
deleted file mode 100644
index d06e35cee7..0000000000
--- a/lightspark/PLIST
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2013/12/16 07:54:18 nsloss Exp $
-bin/lightspark
-bin/tightspark
-lib/lightspark/liblightspark.so
-lib/lightspark/liblightspark.so.0.7
-lib/lightspark/liblightspark.so.${PKGVERSION}
-lib/lightspark/plugins/liblightsparkpulseplugin.so
-lib/netscape/plugins/liblightsparkplugin.so
-man/man1/lightspark.1
-share/applications/lightspark.desktop
-share/examples/lightspark/xdg/lightspark.conf
-share/icons/hicolor/128x128/apps/lightspark.png
-share/icons/hicolor/16x16/apps/lightspark.png
-share/icons/hicolor/192x192/apps/lightspark.png
-share/icons/hicolor/22x22/apps/lightspark.png
-share/icons/hicolor/24x24/apps/lightspark.png
-share/icons/hicolor/256x256/apps/lightspark.png
-share/icons/hicolor/32x32/apps/lightspark.png
-share/icons/hicolor/36x36/apps/lightspark.png
-share/icons/hicolor/48x48/apps/lightspark.png
-share/icons/hicolor/64x64/apps/lightspark.png
-share/icons/hicolor/72x72/apps/lightspark.png
-share/icons/hicolor/96x96/apps/lightspark.png
-share/icons/hicolor/scalable/apps/lightspark.svg
-share/lightspark/lightspark.frag
-share/lightspark/lightspark.vert
-share/locale/fr/LC_MESSAGES/lightspark.mo
-share/locale/pl/LC_MESSAGES/lightspark.mo
-share/locale/zh_CN/LC_MESSAGES/lightspark.mo
diff --git a/lightspark/TODO b/lightspark/TODO
deleted file mode 100644
index a502d14dc5..0000000000
--- a/lightspark/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-No need to preload libGL anymore on firefox 27 NetBSD current 6.99.36
-Lightspark now builds with clang 3.4 on NetBSD current 6.99.36
-So hopefully it is finished. (nsloss 20140327)
diff --git a/lightspark/distinfo b/lightspark/distinfo
deleted file mode 100644
index ab3f9faa09..0000000000
--- a/lightspark/distinfo
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: distinfo,v 1.8 2014/03/29 01:03:06 nsloss Exp $
-
-SHA1 (lightspark-0.7.2.tar.gz) = f4c5fa3cf9da9c39da773640184e102ab9818ed7
-RMD160 (lightspark-0.7.2.tar.gz) = a739cb65815ef2af1b4ad9c5e3a8b9985b9a7055
-Size (lightspark-0.7.2.tar.gz) = 955952 bytes
-SHA1 (patch-CMakeLists.txt) = ac34d884a0618d2e98d449f72ea549813a81d7ec
-SHA1 (patch-src_CMakeLists.txt) = 786f0d60c15451b95819a9827e45815afb0224c2
-SHA1 (patch-src_allclasses.cpp) = 9a803d18bead07e7358512e9f5d3865fb2179a87
-SHA1 (patch-src_backends_geometry.h) = 898cc251a11da1d9af17e9f98d7e5212263628c4
-SHA1 (patch-src_backends_graphics.h) = 915cccd1d36cc3bd6fe7930ec49eb30dd21584fe
-SHA1 (patch-src_backends_interfaces_audio_pulse_CMakeLists.txt) = 01492a6709b7297b8dc65ea8be02a3d1de76b1c8
-SHA1 (patch-src_backends_pluginmanager.cpp) = dc1ae9154b8b54dbc445caaf25898f9e8c783444
-SHA1 (patch-src_compat.cpp) = 176689e5675f663491bc9023ed71887a9978a962
-SHA1 (patch-src_main.cpp) = 4a1677e85eb951078a72ab75edce8a1120a4ae8a
-SHA1 (patch-src_parsing_streams.h) = a749d28cf10bf6176988fe2edc8d26b41ba71419
-SHA1 (patch-src_parsing_tags__stub.cpp) = 7d82a23514a170da6f4e5f4885e17a83753737f0
-SHA1 (patch-src_plugin_CMakeLists.txt) = dbdc471bc1e6608ec80ac800a8e91ac7e06c0044
-SHA1 (patch-src_scripting_abc.cpp) = 1d15d3dcc21bdd82d87e291ab55d09d9692227eb
-SHA1 (patch-src_scripting_abc.h) = c5884c98ec3575633ff54866356b35f12bbbdc58
-SHA1 (patch-src_scripting_abc__codesynt.cpp) = 24e3965d01e7373590f0c0807ed944e511457f79
-SHA1 (patch-src_scripting_class.h) = d3e32788fc4293c1e332c9eb114543def03deb6a
-SHA1 (patch-src_scripting_flash_utils_flashutils.h) = 16dd0bb44e5b0ab571130a70537020fe95bf18ab
diff --git a/lightspark/patches/patch-CMakeLists.txt b/lightspark/patches/patch-CMakeLists.txt
deleted file mode 100644
index 7bdc7a3fd4..0000000000
--- a/lightspark/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2014/03/27 02:03:54 nsloss Exp $
-
-Fix install paths
-Add define for llvm 3.3
-
---- CMakeLists.txt.orig 2013-03-16 11:19:18.000000000 +0000
-+++ CMakeLists.txt
-@@ -114,31 +114,23 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_D
- INCLUDE(Pack)
- # If we're gcc, then use nasm to get fastpath. If MSVC, just use inline asm to get around
- # CMake issues
--IF(CMAKE_COMPILER_IS_GNUCC)
- INCLUDE(CMakeASM-NASMCompiler)
--ENDIF(CMAKE_COMPILER_IS_GNUCC)
- IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$|^x86$")
- SET(i386 1)
- SET(LIB_SUFFIX "" CACHE STRING "Choose the suffix of the lib folder (if any) : None 32")
- # nasm for assembly optimizations
-- IF(CMAKE_COMPILER_IS_GNUCC)
- ENABLE_LANGUAGE(ASM-NASM)
-- ENDIF(CMAKE_COMPILER_IS_GNUCC)
- ELSEIF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "unknown" AND ${CMAKE_SYSTEM} MATCHES "GNU-0.3")
- # GNU Hurd is i386
- SET(i386 1)
- SET(LIB_SUFFIX "" CACHE STRING "Choose the suffix of the lib folder (if any) : None 32")
- # nasm for assembly optimizations
-- IF(CMAKE_COMPILER_IS_GNUCC)
- ENABLE_LANGUAGE(ASM-NASM)
-- ENDIF ()
- ELSEIF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86_64$|^amd64$")
- SET(x86_64 1)
- SET(LIB_SUFFIX "" CACHE STRING "Choose the suffix of the lib folder (if any) : None 64")
- # nasm for assembly optimizations
-- IF(CMAKE_COMPILER_IS_GNUCC)
- ENABLE_LANGUAGE(ASM-NASM)
-- ENDIF(CMAKE_COMPILER_IS_GNUCC)
- ELSEIF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
- SET(ppc 1)
- SET(LIB_SUFFIX "" CACHE STRING "Choose the suffix of the lib folder (if any) : None ppc")
-@@ -166,7 +158,7 @@ ENDIF()
-
- # Using relative folders, cmake happens by itself CMAKE_INSTALL_PREFIX
- IF(UNIX)
-- SET(ETCDIR "/etc") #Using absolute folder
-+ SET(ETCDIR "${CMAKE_INSTALL_PREFIX}/etc") #Using absolute folder
- SET(BINDIR "bin")
- SET(DATADIR "share")
- # Absolute path, because this path is embedded in the binary
-@@ -194,7 +186,7 @@ ELSE()
- SET(AUDIO_BACKEND "pulseaudio" CACHE STRING "Which audio backends should be built?")
- ENDIF()
-
--SET(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Install prefix, default is /usr/local (UNIX) and C:\\Program Files (Windows)")
-+SET(CMAKE_INSTALL_PREFIX "${LOCALBASE}" CACHE PATH "Install prefix, default is /usr/local (UNIX) and C:\\Program Files (Windows)")
- SET(COMPILE_LIGHTSPARK TRUE CACHE BOOL "Compile Lightspark?")
- SET(COMPILE_TIGHTSPARK TRUE CACHE BOOL "Compile Tightspark?")
- SET(COMPILE_PLUGIN TRUE CACHE BOOL "Compile the browser plugin?")
-@@ -204,7 +196,7 @@ SET(ENABLE_LIBAVCODEC TRUE CACHE BOOL "E
- SET(ENABLE_RTMP TRUE CACHE BOOL "Enable librtmp and dependent functionality?")
- SET(ENABLE_PROFILING FALSE CACHE BOOL "Enable profiling support? (Causes performance issues)")
- SET(ENABLE_MEMORY_USAGE_PROFILING FALSE CACHE BOOL "Enable profiling of memory usage? (Causes performance issues)")
--SET(PLUGIN_DIRECTORY "${LIBDIR}/mozilla/plugins" CACHE STRING "Directory to install Firefox plugin to")
-+SET(PLUGIN_DIRECTORY "${LIBDIR}/netscape/plugins" CACHE STRING "Directory to install Firefox plugin to")
-
- IF(ENABLE_DEBIAN_ALTERNATIVES OR WIN32)
- SET(PLUGIN_DIRECTORY ${PRIVATELIBDIR})
-@@ -238,6 +230,12 @@ ENDIF(${LLVM_STRING_VERSION} VERSION_EQU
- IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.0)
- ADD_DEFINITIONS(-DLLVM_31)
- ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.0)
-+IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.2)
-+ ADD_DEFINITIONS(-DLLVM_33)
-+ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.2)
-+IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.3)
-+ ADD_DEFINITIONS(-DLLVM_34)
-+ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.3)
- INCLUDE(FindZLIB REQUIRED)
- INCLUDE(FindFreetype REQUIRED)
- IF(NOT(ENABLE_GLES2))
-@@ -426,8 +424,8 @@ IF(CMAKE_COMPILER_IS_GNUCC)
- SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O2 -DNDEBUG")
- SET(CMAKE_CXX_FLAGS_LEANDEBUG "-g -O2")
-- ADD_DEFINITIONS(-DLS_DATADIR="${LSDATADIR}" -DGNASH_PATH="${GNASH_EXE_PATH}" -DPRIVATELIBDIR="${PRIVATELIBDIR}")
- ENDIF(CMAKE_COMPILER_IS_GNUCC)
-+ADD_DEFINITIONS(-DLS_DATADIR="${LSDATADIR}" -DGNASH_PATH="${GNASH_EXE_PATH}" -DPRIVATELIBDIR="${PRIVATELIBDIR}")
-
- IF(MSVC)
- ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -DVPCOMPAT -DPTW32_STATIC_LIB -DPCRE_STATIC)
diff --git a/lightspark/patches/patch-src_CMakeLists.txt b/lightspark/patches/patch-src_CMakeLists.txt
deleted file mode 100644
index 3e9babfc30..0000000000
--- a/lightspark/patches/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.2 2014/02/21 23:27:38 nsloss Exp $
-
-Add rpath so binaries can find liblightspark
-Add addional libraries to liblightspark for successful linking
-Build liblightspark shared library on compilers other than gcc
-
---- src/CMakeLists.txt.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -123,7 +123,6 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR
- INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/scripting)
-
- # liblightspark.so target
--IF(CMAKE_COMPILER_IS_GNUCC)
- ADD_LIBRARY(spark SHARED ${LIBSPARK_SOURCES})
- IF(NOT WIN32)
- #win32's cmake doesn't like liblightspark and lightspark.exe having the same name
-@@ -135,12 +134,9 @@ IF(CMAKE_COMPILER_IS_GNUCC)
- SET_TARGET_PROPERTIES(spark PROPERTIES LINK_FLAGS "-Wl,--version-script=${PROJECT_SOURCE_DIR}/src/lightspark.expmap")
- ENDIF()
- SET_TARGET_PROPERTIES(spark PROPERTIES LINK_INTERFACE_LIBRARIES "")
--ELSE (CMAKE_COMPILER_IS_GNUCC)
-- ADD_LIBRARY(spark STATIC ${LIBSPARK_SOURCES})
--ENDIF (CMAKE_COMPILER_IS_GNUCC)
-
- TARGET_LINK_LIBRARIES(spark ${CAIRO_LIBRARIES} ${ZLIB_LIBRARIES}
-- ${Boost_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${LLVM_LDFLAGS}
-+ ${Boost_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} -lcompiler_rt -lc ${LLVM_LDFLAGS}
- ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${FREETYPE_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES}
- ${PCRE_LIBRARIES} ${GLIBMM_LIBRARIES} ${GMODULE_LIBRARIES}
- ${XMLPP_LIBRARIES} ${CMAKE_DL_LIBS} ${EXTRA_LIBS_LIBRARIES}
-@@ -161,6 +157,7 @@ INSTALL(TARGETS spark RUNTIME DESTINATIO
- # lightspark executable target
- IF(COMPILE_LIGHTSPARK)
- ADD_EXECUTABLE(lightspark main.cpp)
-+ SET_TARGET_PROPERTIES(lightspark PROPERTIES LINK_FLAGS "-Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib/lightspark")
- TARGET_LINK_LIBRARIES(lightspark spark)
- #With STATICDEPS, all deps are compiled into spark
- IF(NOT STATICDEPS)
-@@ -172,13 +169,14 @@ IF(COMPILE_LIGHTSPARK)
- INSTALL(FILES ${PROJECT_SOURCE_DIR}/src/lightspark.vert DESTINATION ${LSDATADIR})
- INSTALL(TARGETS lightspark RUNTIME DESTINATION ${BINDIR})
- IF(UNIX)
-- INSTALL(FILES ${PROJECT_SOURCE_DIR}/docs/man/lightspark.1 DESTINATION share/man/man1)
-+ INSTALL(FILES ${PROJECT_SOURCE_DIR}/docs/man/lightspark.1 DESTINATION man/man1)
- ENDIF(UNIX)
- ENDIF(COMPILE_LIGHTSPARK)
-
- # tightspark executable target
- IF(COMPILE_TIGHTSPARK)
- ADD_EXECUTABLE(tightspark tightspark.cpp)
-+ SET_TARGET_PROPERTIES(tightspark PROPERTIES LINK_FLAGS "-Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib/lightspark")
- TARGET_LINK_LIBRARIES(tightspark spark)
- #With STATICDEPS, all deps are compiled into spark
- IF(NOT STATICDEPS)
diff --git a/lightspark/patches/patch-src_allclasses.cpp b/lightspark/patches/patch-src_allclasses.cpp
deleted file mode 100644
index 77fcea5f93..0000000000
--- a/lightspark/patches/patch-src_allclasses.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_allclasses.cpp,v 1.1 2014/03/03 08:12:25 nsloss Exp $
-
-Fix for building with clang otherwise a template of ASObject is created after it is insantiated.
-
---- src/allclasses.cpp.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/allclasses.cpp
-@@ -17,6 +17,8 @@
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- **************************************************************************/
-
-+#define ALLCLASSES_CPP
-+
- #include "scripting/toplevel/ASString.h"
- #include "scripting/toplevel/Date.h"
- #include "scripting/toplevel/Math.h"
-@@ -87,3 +89,5 @@ CLASS_LAST
-
- //Define a variable to let outside code know the number of defined classes
- uint32_t asClassCount = CLASS_LAST;
-+
-+#undef ALLCLASSES_CPP
diff --git a/lightspark/patches/patch-src_backends_geometry.h b/lightspark/patches/patch-src_backends_geometry.h
deleted file mode 100644
index 526a2b1597..0000000000
--- a/lightspark/patches/patch-src_backends_geometry.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_backends_geometry.h,v 1.1 2014/02/22 12:17:46 thomasklausner Exp $
-
-C++ does not allow > > except as operator.
-
---- src/backends/geometry.h.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/backends/geometry.h
-@@ -85,7 +85,7 @@ public:
- GeomToken(GEOM_TOKEN_TYPE _t, const MATRIX _m):fillStyle(0xff),lineStyle(0xff),textureTransform(_m),type(_t),p1(0,0),p2(0,0),p3(0,0){}
- };
-
--typedef std::vector<GeomToken, reporter_allocator<GeomToken>> tokensVector;
-+typedef std::vector<GeomToken, reporter_allocator<GeomToken> > tokensVector;
-
- enum SHAPE_PATH_SEGMENT_TYPE { PATH_START=0, PATH_STRAIGHT, PATH_CURVE_QUADRATIC };
-
diff --git a/lightspark/patches/patch-src_backends_graphics.h b/lightspark/patches/patch-src_backends_graphics.h
deleted file mode 100644
index 466502b12a..0000000000
--- a/lightspark/patches/patch-src_backends_graphics.h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_backends_graphics.h,v 1.1 2014/02/22 12:17:46 thomasklausner Exp $
-
-C++ does not allow > > except as operator.
-
---- src/backends/graphics.h.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/backends/graphics.h
-@@ -289,12 +289,12 @@ public:
- /*
- * Converts data (which is in RGB format) to the format internally used by cairo.
- */
-- static void convertBitmapToCairo(std::vector<uint8_t, reporter_allocator<uint8_t>>& data, uint8_t* inData, uint32_t width,
-+ static void convertBitmapToCairo(std::vector<uint8_t, reporter_allocator<uint8_t> >& data, uint8_t* inData, uint32_t width,
- uint32_t height, size_t* dataSize, size_t* stride, bool rgb15);
- /*
- * Converts data (which is in ARGB format) to the format internally used by cairo.
- */
-- static void convertBitmapWithAlphaToCairo(std::vector<uint8_t, reporter_allocator<uint8_t>>& data, uint8_t* inData, uint32_t width,
-+ static void convertBitmapWithAlphaToCairo(std::vector<uint8_t, reporter_allocator<uint8_t> >& data, uint8_t* inData, uint32_t width,
- uint32_t height, size_t* dataSize, size_t* stride);
- };
-
-@@ -398,7 +398,7 @@ public:
- class SoftwareInvalidateQueue: public InvalidateQueue
- {
- public:
-- std::list<_R<DisplayObject>> queue;
-+ std::list<_R<DisplayObject> > queue;
- void addToInvalidateQueue(_R<DisplayObject> d);
- };
-
diff --git a/lightspark/patches/patch-src_backends_interfaces_audio_pulse_CMakeLists.txt b/lightspark/patches/patch-src_backends_interfaces_audio_pulse_CMakeLists.txt
deleted file mode 100644
index beebf2a513..0000000000
--- a/lightspark/patches/patch-src_backends_interfaces_audio_pulse_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_backends_interfaces_audio_pulse_CMakeLists.txt,v 1.1 2013/12/16 07:54:18 nsloss Exp $
-
-Add rpath so the pulse plugin can find liblightspark
-
---- src/backends/interfaces/audio/pulse/CMakeLists.txt.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/backends/interfaces/audio/pulse/CMakeLists.txt
-@@ -46,6 +46,7 @@ SET(PULSEPLUGIN_SOURCES PulsePlugin.cpp
-
- # liblightsparkpulseplugin.so target
- ADD_LIBRARY(pulseplugin MODULE ${PULSEPLUGIN_SOURCES})
-+SET_TARGET_PROPERTIES(pulseplugin PROPERTIES LINK_FLAGS "-Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib/lightspark")
- TARGET_LINK_LIBRARIES(pulseplugin spark) #Need to link some functions with the decoders
- TARGET_LINK_LIBRARIES(pulseplugin ${PULSE_LIBS_LIBRARIES} ${Boost_LIBRARIES})
- SET_TARGET_PROPERTIES(pulseplugin PROPERTIES OUTPUT_NAME lightsparkpulseplugin)
diff --git a/lightspark/patches/patch-src_backends_pluginmanager.cpp b/lightspark/patches/patch-src_backends_pluginmanager.cpp
deleted file mode 100644
index 44907096f7..0000000000
--- a/lightspark/patches/patch-src_backends_pluginmanager.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_backends_pluginmanager.cpp,v 1.1 2013/12/16 07:54:18 nsloss Exp $
-
-Unset locale variables to avoid crash. Maybe a problem with libboost.
-
---- src/backends/pluginmanager.cpp.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/backends/pluginmanager.cpp
-@@ -61,9 +61,12 @@ void PluginManager::findPlugins()
- throw RunTimeException("PluginManager::findPlugins(): can't compile file_pattern");
- //We don't expect any captured substrings, so 3 ints should be enough
-
--#if defined DEBUG
- LOG(LOG_INFO, "Looking for plugins under " << plugins_folder << " for pattern " << pattern);
--#endif
-+
-+ setenv("LANG", "C", 1);
-+ setenv("LC_CTYPE", "C", 1);
-+ setlocale(LC_CTYPE,"");
-+ setlocale(LC_ALL,"");
-
- if ( !is_directory ( plugins_folder ) )
- {
diff --git a/lightspark/patches/patch-src_compat.cpp b/lightspark/patches/patch-src_compat.cpp
deleted file mode 100644
index 4d5f2845a3..0000000000
--- a/lightspark/patches/patch-src_compat.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_compat.cpp,v 1.1 2013/12/16 07:54:18 nsloss Exp $
-
-CLOCK_THREAD_CPUTIME_ID does not exit on NetBSD.
-
---- src/compat.cpp.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/compat.cpp
-@@ -74,6 +74,7 @@ uint64_t timespecToUsecs(timespec t)
-
- uint64_t compat_get_thread_cputime_us()
- {
-+#ifndef __NetBSD__
- timespec tp;
-
- #ifndef _POSIX_THREAD_CPUTIME
-@@ -81,6 +82,9 @@ uint64_t compat_get_thread_cputime_us()
- #endif
- clock_gettime(CLOCK_THREAD_CPUTIME_ID,&tp);
- return timespecToUsecs(tp);
-+#else
-+ return 0;
-+#endif
- }
-
- void aligned_malloc(void **memptr, size_t alignment, size_t size)
diff --git a/lightspark/patches/patch-src_main.cpp b/lightspark/patches/patch-src_main.cpp
deleted file mode 100644
index 920841ed97..0000000000
--- a/lightspark/patches/patch-src_main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_main.cpp,v 1.1 2013/12/16 07:54:18 nsloss Exp $
-
-get_current_dir_name() is not found on NetBSD.
-
---- src/main.cpp.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/main.cpp
-@@ -28,6 +28,9 @@
- #endif
- #include "compat.h"
-
-+#ifdef __NetBSD__
-+#define get_current_dir_name() getcwd(NULL, PATH_MAX)
-+#endif
-
- using namespace std;
- using namespace lightspark;
diff --git a/lightspark/patches/patch-src_parsing_streams.h b/lightspark/patches/patch-src_parsing_streams.h
deleted file mode 100644
index f81bb94e62..0000000000
--- a/lightspark/patches/patch-src_parsing_streams.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_parsing_streams.h,v 1.1 2014/03/03 08:12:25 nsloss Exp $
-
-Commented out functions as they break when built with clang as they are out of line declarations.
-
---- src/parsing/streams.h.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/parsing/streams.h
-@@ -116,9 +116,9 @@ public:
- bool eof() const;
- };
-
--memorystream& lightspark::operator>>(memorystream& in, lightspark::u8& v);
--memorystream& lightspark::operator>>(memorystream& in, lightspark::s24& v);
--memorystream& lightspark::operator>>(memorystream& in, lightspark::u30& v);
--memorystream& lightspark::operator>>(memorystream& in, lightspark::u32& v);
-+//memorystream& lightspark::operator>>(memorystream& in, lightspark::u8& v);
-+//memorystream& lightspark::operator>>(memorystream& in, lightspark::s24& v);
-+//memorystream& lightspark::operator>>(memorystream& in, lightspark::u30& v);
-+//memorystream& lightspark::operator>>(memorystream& in, lightspark::u32& v);
-
- #endif /* PARSING_STREAMS_H */
diff --git a/lightspark/patches/patch-src_parsing_tags__stub.cpp b/lightspark/patches/patch-src_parsing_tags__stub.cpp
deleted file mode 100644
index 4c4a5cfbbf..0000000000
--- a/lightspark/patches/patch-src_parsing_tags__stub.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_parsing_tags__stub.cpp,v 1.1 2014/03/03 08:12:25 nsloss Exp $
-
-Comment out function declaration as this will beak when built with clang - out of line definition.
-
---- src/parsing/tags_stub.cpp.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/parsing/tags_stub.cpp
-@@ -25,7 +25,7 @@
- using namespace std;
- using namespace lightspark;
-
--void lightspark::ignore(istream& i, int count);
-+//void lightspark::ignore(istream& i, int count);
-
- ProtectTag::ProtectTag(RECORDHEADER h, istream& in):ControlTag(h)
- {
diff --git a/lightspark/patches/patch-src_plugin_CMakeLists.txt b/lightspark/patches/patch-src_plugin_CMakeLists.txt
deleted file mode 100644
index 6da7350fbb..0000000000
--- a/lightspark/patches/patch-src_plugin_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_plugin_CMakeLists.txt,v 1.1 2013/12/16 07:54:18 nsloss Exp $
-
-Add rpath so plugins can find liblightspark.
-
---- src/plugin/CMakeLists.txt.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/plugin/CMakeLists.txt
-@@ -44,6 +44,7 @@ IF(WIN32)
- ENDIF(WIN32)
-
- ADD_LIBRARY(lightsparkplugin MODULE ${PLUGIN_SOURCES})
-+SET_TARGET_PROPERTIES(lightsparkplugin PROPERTIES LINK_FLAGS "-Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib/lightspark")
-
- TARGET_LINK_LIBRARIES(lightsparkplugin spark)
-
diff --git a/lightspark/patches/patch-src_scripting_abc.cpp b/lightspark/patches/patch-src_scripting_abc.cpp
deleted file mode 100644
index 4a6581ad8d..0000000000
--- a/lightspark/patches/patch-src_scripting_abc.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-src_scripting_abc.cpp,v 1.2 2014/03/26 06:02:43 nsloss Exp $
-
-Add definitions to compile with llvm 3.3
-Add definitions to compile with llvm 3.4 Should work with 3.5
-
---- src/scripting/abc.cpp.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/scripting/abc.cpp
-@@ -23,12 +23,26 @@
-
- #include "compat.h"
-
-+#ifdef LLVM_33
-+#include <llvm/IR/Module.h>
-+#else
- #include <llvm/Module.h>
-+#endif
- #include <llvm/ExecutionEngine/ExecutionEngine.h>
- #include <llvm/ExecutionEngine/JIT.h>
-+#ifdef LLVM_34
-+#include <llvm/IR/LegacyPassManager.h>
-+#else
- #include <llvm/PassManager.h>
-+#endif
-+#ifdef LLVM_33
-+#include <llvm/IR/LLVMContext.h>
-+#else
- #include <llvm/LLVMContext.h>
--#ifdef HAVE_DATALAYOUT_H
-+#endif
-+#ifdef LLVM_33
-+# include <llvm/IR/DataLayout.h>
-+#elif defined(HAVE_DATALAYOUT_H)
- # include <llvm/DataLayout.h>
- #else
- # include <llvm/Target/TargetData.h>
-@@ -1464,14 +1478,16 @@ void ABCVm::Run(ABCVm* th)
-
- if(th->m_sys->useJit)
- {
--#ifdef LLVM_31
-+#if defined(LLVM_31) || defined(LLVM_33)
- llvm::TargetOptions Opts;
-+#if !defined(LLVM_34)
- Opts.JITExceptionHandling = true;
-+#endif
- #else
- llvm::JITExceptionHandling = true;
- #endif
- #ifndef NDEBUG
--#ifdef LLVM_31
-+#if defined(LLVM_31) || defined(LLVM_33)
- Opts.JITEmitDebugInfo = true;
- #else
- llvm::JITEmitDebugInfo = true;
-@@ -1481,15 +1497,19 @@ void ABCVm::Run(ABCVm* th)
- th->module=new llvm::Module(llvm::StringRef("abc jit"),th->llvm_context());
- llvm::EngineBuilder eb(th->module);
- eb.setEngineKind(llvm::EngineKind::JIT);
--#ifdef LLVM_31
-+#if defined(LLVM_31) || defined(LLVM_33)
- eb.setTargetOptions(Opts);
- #endif
- eb.setOptLevel(llvm::CodeGenOpt::Default);
- th->ex=eb.create();
- assert_and_throw(th->ex);
-
-+#ifdef LLVM_34
-+ th->FPM=new llvm::legacy::FunctionPassManager(th->module);
-+#else
- th->FPM=new llvm::FunctionPassManager(th->module);
--#ifdef HAVE_DATALAYOUT_H
-+#endif
-+#if defined(HAVE_DATALAYOUT_H) || defined(LLVM_33)
- th->FPM->add(new llvm::DataLayout(*th->ex->getDataLayout()));
- #else
- th->FPM->add(new llvm::TargetData(*th->ex->getTargetData()));
diff --git a/lightspark/patches/patch-src_scripting_abc.h b/lightspark/patches/patch-src_scripting_abc.h
deleted file mode 100644
index dbd0509670..0000000000
--- a/lightspark/patches/patch-src_scripting_abc.h
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_scripting_abc.h,v 1.2 2014/03/29 01:03:06 nsloss Exp $
-
-Add definitions to work with llvm 3.4. Should work with 3.5.
-
---- src/scripting/abc.h.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/scripting/abc.h
-@@ -32,6 +32,9 @@
- #include "scripting/abcutils.h"
- #include "scripting/abctypes.h"
- #include "scripting/flash/system/flashsystem.h"
-+#ifdef LLVM_34
-+#include <llvm/IR/LegacyPassManager.h>
-+#endif
-
- namespace llvm {
- class ExecutionEngine;
-@@ -428,7 +431,11 @@ public:
- MemoryAccount* vmDataMemory;
-
- llvm::ExecutionEngine* ex;
-+#ifdef LLVM_34
-+ llvm::legacy::FunctionPassManager* FPM;
-+#else
- llvm::FunctionPassManager* FPM;
-+#endif
- llvm::LLVMContext& llvm_context();
-
- ABCVm(SystemState* s, MemoryAccount* m) DLL_PUBLIC;
diff --git a/lightspark/patches/patch-src_scripting_abc__codesynt.cpp b/lightspark/patches/patch-src_scripting_abc__codesynt.cpp
deleted file mode 100644
index d6005824e8..0000000000
--- a/lightspark/patches/patch-src_scripting_abc__codesynt.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-src_scripting_abc__codesynt.cpp,v 1.2 2014/03/26 06:02:43 nsloss Exp $
-
-Add definitions to compile with llvm 3.3
-Add definitions to compile with llvm 3.4. Should work with 3.5.
-
---- src/scripting/abc_codesynt.cpp.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/scripting/abc_codesynt.cpp
-@@ -25,18 +25,39 @@
- #endif
-
- #include "compat.h"
-+#ifdef LLVM_33
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#else
- #include <llvm/Module.h>
- #include <llvm/DerivedTypes.h>
-+#endif
- #include <llvm/ExecutionEngine/ExecutionEngine.h>
-+#ifdef LLVM_34
-+#include <llvm/IR/LegacyPassManager.h>
-+#else
- #include <llvm/PassManager.h>
-+#endif
-+#ifdef LLVM_33
-+#include <llvm/IR/Constants.h>
-+#else
- #include <llvm/Constants.h>
--#ifdef HAVE_IRBUILDER_H
-+#endif
-+#ifdef LLVM_33
-+# include <llvm/IR/IRBuilder.h>
-+#elif defined(HAVE_IRBUILDER_H)
- # include <llvm/IRBuilder.h>
- #else
- # include <llvm/Support/IRBuilder.h>
- #endif
-+#ifdef LLVM_33
-+#include <llvm/IR/LLVMContext.h>
-+#else
- #include <llvm/LLVMContext.h>
--#ifdef HAVE_DATALAYOUT_H
-+#endif
-+#if defined(LLVM_33)
-+# include <llvm/IR/DataLayout.h>
-+#elif defined(HAVE_DATALAYOUT_H)
- # include <llvm/DataLayout.h>
- #else
- # include <llvm/Target/TargetData.h>
-@@ -279,7 +300,7 @@ void ABCVm::registerFunctions()
- llvm::FunctionType* FT=NULL;
-
- //Create types
--#ifdef HAVE_DATALAYOUT_H
-+#if defined(HAVE_DATALAYOUT_H) || defined (LLVM_33)
- ptr_type=ex->getDataLayout()->getIntPtrType(llvm_context());
- #else
- ptr_type=ex->getTargetData()->getIntPtrType(llvm_context());
diff --git a/lightspark/patches/patch-src_scripting_class.h b/lightspark/patches/patch-src_scripting_class.h
deleted file mode 100644
index a311b11ad4..0000000000
--- a/lightspark/patches/patch-src_scripting_class.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_scripting_class.h,v 1.1 2014/03/03 08:12:25 nsloss Exp $
-
-Fix for building with clang don't allow instantiation of ASObject template here when included in allclasses.cpp.
-
---- src/scripting/class.h.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/scripting/class.h
-@@ -228,6 +228,7 @@ inline ASObject* Class<Boolean>::coerce(
- return abstract_b(n);
- }
-
-+#if !defined(ALLCLASSES_CPP)
- template<>
- class Class<ASObject>: public Class_base
- {
-@@ -318,6 +319,7 @@ public:
- return ret;
- }
- };
-+#endif
-
- /* InterfaceClass implements interfaces. E.g., if you declare a variable of type IEventDispatcher in AS3,
- * then the type in our code will be InterfaceClass<IEventDispatcher>.
diff --git a/lightspark/patches/patch-src_scripting_flash_utils_flashutils.h b/lightspark/patches/patch-src_scripting_flash_utils_flashutils.h
deleted file mode 100644
index d54d79766b..0000000000
--- a/lightspark/patches/patch-src_scripting_flash_utils_flashutils.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_scripting_flash_utils_flashutils.h,v 1.1 2014/02/22 12:17:46 thomasklausner Exp $
-
-C++ does not allow > > except as operator.
-
---- src/scripting/flash/utils/flashutils.h.orig 2013-03-16 11:19:18.000000000 +0000
-+++ src/scripting/flash/utils/flashutils.h
-@@ -200,8 +200,8 @@ class Dictionary: public ASObject
- {
- friend class ABCVm;
- private:
-- typedef std::map<_R<ASObject>,_R<ASObject>,std::less<_R<ASObject>>,
-- reporter_allocator<std::pair<const _R<ASObject>, _R<ASObject>>>> dictType;
-+ typedef std::map<_R<ASObject>,_R<ASObject>,std::less<_R<ASObject> >,
-+ reporter_allocator<std::pair<const _R<ASObject>, _R<ASObject> > > > dictType;
- dictType data;
- dictType::iterator findKey(ASObject *);
- public:
Home |
Main Index |
Thread Index |
Old Index