[SCM] x265/master: No longer needed

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sat Feb 6 20:36:00 UTC 2016


The following commit has been merged in the master branch:
commit c8d2943ec9251ee70bd9450826768e35856dc6dd
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Feb 6 21:35:24 2016 +0100

    No longer needed

diff --git a/debian/patches/fix-linking-with-dl.patch b/debian/patches/fix-linking-with-dl.patch
deleted file mode 100644
index 11f9255..0000000
--- a/debian/patches/fix-linking-with-dl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Pass libs in proper order
-Author: Sebastian Ramacher <sramacher at debian.org>
-Bug-Debian: https://bugs.debian.org/802093
-Forwarded: https://bitbucket.org/multicoreware/x265/issues/202/library-not-linked-against-libdl-for
-Last-Update: 2015-10-18
-
---- x265-1.8.orig/source/CMakeLists.txt
-+++ x265-1.8/source/CMakeLists.txt
-@@ -457,6 +457,9 @@ option(ENABLE_SHARED "Build shared libra
- if(ENABLE_SHARED)
-     add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" ${YASM_OBJS}
-                 ${X265_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common>)
-+    if(EXTRA_LIB)
-+        target_link_libraries(x265-shared ${EXTRA_LIB})
-+    endif()
-     target_link_libraries(x265-shared ${PLATFORM_LIBS})
-     if(MSVC)
-         set_target_properties(x265-shared PROPERTIES OUTPUT_NAME libx265)
-@@ -482,9 +485,6 @@ if(ENABLE_SHARED)
-                 ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-                 RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-     endif()
--    if(EXTRA_LIB)
--        target_link_libraries(x265-shared ${EXTRA_LIB})
--    endif()
-     if(LINKER_OPTIONS)
-         # set_target_properties can't do list expansion
-         string(REPLACE ";" " " LINKER_OPTION_STR "${LINKER_OPTIONS}")
diff --git a/debian/patches/fix-version-info.patch b/debian/patches/fix-version-info.patch
deleted file mode 100644
index 6c7ea61..0000000
--- a/debian/patches/fix-version-info.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix version info
- Remember to use the tarball from videolan.org next time.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Bug-Debian: https://bugs.debian.org/802092
-Forwarded: not-needed
-Last-Update: 2015-10-18
-
---- x265-1.8.orig/.hg_archival.txt
-+++ x265-1.8/.hg_archival.txt
-@@ -1,5 +1,4 @@
- repo: 09fe40627f03a0f9c3e6ac78b22ac93da23f9fdf
--node: 5dcc9d3a928c400b41a3547d7bfee10340519e56
-+node: e27327f5da35c5feb660360336fdc94bd0afe719 
- branch: stable
--latesttag: 1.8
--latesttagdistance: 1
-+tag: 1.8

-- 
x265 packaging



More information about the pkg-multimedia-commits mailing list