← Back to branch summary

~ubuntu-branches/ubuntu/precise/vlc/precise-proposed

« back to all changes in this revision

Viewing changes to contrib/src/src/taglib/taglib-win32.patch

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2012-03-24 01:33:03 UTC
  • mfrom: (1.1.46) (3.5.39 sid)
  • Revision ID: package-import@ubuntu.com-20120324013303-km51kpl9kixydb8g
http://bugs.debian.org/613121
http://bugs.debian.org/662217
Really add the preinst from Didier Raboud to vlc to drop it's doc directory
before unpacking a symlink to vlc-nox's over it. (Closes: #613121, #662217)

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/src/src/taglib/taglib-win32.patch
1
 
diff -ru taglib-1.7.orig/CMakeLists.txt taglib-1.7/CMakeLists.txt
2
 
--- taglib-1.7.orig/CMakeLists.txt      2011-11-06 19:44:44.574744323 -0500
3
 
+++ taglib-1.7/CMakeLists.txt   2011-11-06 19:44:56.118801560 -0500
4
 
@@ -49,9 +49,7 @@
5
 
 
6
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib-config )
7
 
 
8
 
-if(NOT WIN32)
9
 
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc )
10
 
-endif(NOT WIN32)
11
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
12
 
 configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
13
 
 
14
 
@@ -70,9 +68,7 @@
15
 
 ADD_SUBDIRECTORY(examples)
16
 
 
17
 
 ADD_SUBDIRECTORY(bindings)
18
 
-if(NOT WIN32)
19
 
   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
20
 
-endif(NOT WIN32)
21
 
 
22
 
 INSTALL( PROGRAMS  ${CMAKE_CURRENT_BINARY_DIR}/taglib-config DESTINATION ${BIN_INSTALL_DIR})
23