From 3f4c2d03709b4de7ee6c87405e35c293701234f8 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Fri, 25 Feb 2005 19:21:42 +0000 Subject: [PATCH] Clifford Wolf: Fixed dvdstyler [2005022520114006031] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5668 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/blindcoder/dvdstyler/dvdstyler.desc | 2 +- package/blindcoder/dvdstyler/hotfixes.patch | 31 +++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 package/blindcoder/dvdstyler/hotfixes.patch diff --git a/package/blindcoder/dvdstyler/dvdstyler.desc b/package/blindcoder/dvdstyler/dvdstyler.desc index dc4621637..e1e4fc7b6 100644 --- a/package/blindcoder/dvdstyler/dvdstyler.desc +++ b/package/blindcoder/dvdstyler/dvdstyler.desc @@ -36,6 +36,6 @@ [L] GPL [S] Stable [V] 1.1 -[P] X -----5---9 800.000 +[P] X -----5---9 800.500 [D] 2521134643 DVDStyler-1.1.tar.gz http://ovh.dl.sourceforge.net/sourceforge/dvdstyler/ diff --git a/package/blindcoder/dvdstyler/hotfixes.patch b/package/blindcoder/dvdstyler/hotfixes.patch new file mode 100644 index 000000000..34a0057f5 --- /dev/null +++ b/package/blindcoder/dvdstyler/hotfixes.patch @@ -0,0 +1,31 @@ +--- ./src/Config.h.orig 2005-02-25 20:01:13.323362352 +0100 ++++ ./src/Config.h 2005-02-25 20:05:58.288041136 +0100 +@@ -67,7 +67,7 @@ + + #define CONFIG_PROP_T(name, cfgName, defName, cfgType)\ + cfgType Get##name(bool def = false)\ +- { return def ? defName : cfg->Read(cfgName, defName); }\ ++ { return def ? defName : cfg->Read(cfgName, (cfgType&)defName); }\ + void Set##name(cfgType value)\ + {\ + wxLogNull log;\ +--- ./wxVillaLib/imagjpg.cpp.orig 2005-02-25 19:45:01.000000000 +0100 ++++ ./wxVillaLib/imagjpg.cpp 2005-02-25 20:08:56.000024808 +0100 +@@ -115,7 +115,7 @@ + + #define OUTPUT_BUF_SIZE 4096 /* choose an efficiently fwrite'able size */ + +-#if !wxCHECK_VERSION(2,5,0) ++// #if !wxCHECK_VERSION(2,5,0) + #define wx_init_source my_init_sources + #define wx_fill_input_buffer my_fill_input_buffer + #define wx_skip_input_data my_skip_input_data +@@ -124,7 +124,7 @@ + #define wx_init_destination init_destination + #define wx_empty_output_buffer empty_output_buffer + #define wx_term_destination term_destination +-#endif ++// #endif + + + #ifdef JPEG_METHOD_LINKAGE