Overview

Request 212 (accepted)

fix build on 12.1 and later, remove builddate

Submit package home:seife:branches:Multimedia / qdvdauthor to package Multimedia / qdvdauthor

qdvdauthor.changes Changed
x
 
1
@@ -1,4 +1,11 @@
2
 -------------------------------------------------------------------
3
+Thu May 17 17:23:35 UTC 2012 - seife+obs@b1-systems.com
4
+
5
+- fix 12.1 buildfix patch
6
+- fix build with gcc 4.7 (> 12.1)
7
+- remove builddate from binaries to avoid republishing
8
+
9
+-------------------------------------------------------------------
10
 Mon Jun 13 00:00:00 UTC 2011 - Manfred.Tremmel@iiv.de
11
 
12
 - fix compile with latest ffmpeg snapshot
13
qdvdauthor.spec Changed
19
 
1
@@ -15,6 +15,8 @@
2
 %if %suse_version > 1140
3
 Patch1:         fix-build-os121.patch
4
 %endif
5
+Patch2:         qdvdauthor-gcc47.patch
6
+Patch3:         qdvdauthor-remove-builddate.patch
7
 
8
 Requires:       bc bzip2 dv2sub dvdauthor dvd-slideshow ImageMagick
9
 Requires:       ImageMagick-Magick++ lame mjpegtools MPlayer sox
10
@@ -39,6 +41,8 @@
11
 %if %suse_version > 1140
12
 %patch1 -p1
13
 %endif
14
+%patch2 -p1
15
+%patch3 -p1
16
 # fix compile with latest ffmpeg snapshot
17
 sed -i -e "s/-DQDVD_RENDER/-DQDVD_RENDER -D__STDC_CONSTANT_MACROS/g" qrender/Makefile.tmp
18
 sed -i -e "s/QDVD_RENDER/QDVD_RENDER __STDC_CONSTANT_MACROS/g" qrender/qrender.pro
19
fix-build-os121.patch Changed
23
 
1
@@ -1,11 +1,17 @@
2
---- qdvdauthor/qdvdauthor/qdvdauthor.pro   2010-07-13 14:04:44.000000000 +0200
3
-+++ new/qdvdauthor/qdvdauthor.pro  2011-10-18 19:04:59.721146748 +0200
4
-@@ -321,7 +321,7 @@
5
+Index: b/qdvdauthor/qdvdauthor.pro
6
+===================================================================
7
+--- a/qdvdauthor/qdvdauthor.pro
8
++++ b/qdvdauthor/qdvdauthor.pro
9
+@@ -319,11 +319,11 @@ HEADERS  += ../bugs_workaround.h \
10
+   qplayer/engines/dummywidget.h  \
11
+   qplayer/engines/mediainterface.h\
12
    xml_slideshow.h       \
13
    plugins/menuslide/menuslide.h
14
  
15
 -LIB_EXTRA=
16
-+LIB_EXTRA= -ldl
17
++LIB_EXTRA= echo -ldl
18
  # Next we take care of the media backend dependencies
19
  contains ( HAS_XINE_SUPPORT, 1 )  {
20
    HAS_PLAYER_SUPPORT=true
21
+   XINE_CONFIG=$$system(which xine-config)
22
+   isEmpty ( XINE_CONFIG ) {
23
qdvdauthor-gcc47.patch Added
50
 
1
@@ -0,0 +1,48 @@
2
+Index: b/qdvdauthor/render_client.cpp
3
+===================================================================
4
+--- a/qdvdauthor/render_client.cpp
5
++++ b/qdvdauthor/render_client.cpp
6
+@@ -30,10 +30,11 @@
7
+ 
8
+ #include <math.h>
9
+ #include <stdlib.h>
10
+ #include <arpa/inet.h>
11
+ #include <sys/stat.h>
12
++#include <unistd.h>
13
+ 
14
+ #include <qdir.h>
15
+ #include <qfile.h>
16
+ #include <qimage.h>
17
+ #include <qtimer.h>
18
+Index: b/qdvdauthor/oneclickwizard.cpp
19
+===================================================================
20
+--- a/qdvdauthor/oneclickwizard.cpp
21
++++ b/qdvdauthor/oneclickwizard.cpp
22
+@@ -7,10 +7,11 @@
23
+ **   License : GPL v 2.0
24
+ **
25
+ *****************************************************************************/
26
+ #include <stdlib.h> 
27
+ #include <dlfcn.h>
28
++#include <unistd.h>
29
+ 
30
+ #include <qdir.h>
31
+ #include <qframe.h>
32
+ #include <qlabel.h>
33
+ #include <qimage.h>
34
+Index: b/qdvdauthor/dialogslideshow.cpp
35
+===================================================================
36
+--- a/qdvdauthor/dialogslideshow.cpp
37
++++ b/qdvdauthor/dialogslideshow.cpp
38
+@@ -6,10 +6,11 @@
39
+ ** Copyright : (c) Varol Okan
40
+ **   License : GPL v 2.0
41
+ **
42
+ *****************************************************************************/
43
+ 
44
++#include <unistd.h>
45
+ #include <qlabel.h>
46
+ #include <qimage.h>
47
+ #include <qtimer.h>
48
+ #include <qpixmap.h>
49
+ #include <qcursor.h>
50
qdvdauthor-remove-builddate.patch Added
130
 
1
@@ -0,0 +1,128 @@
2
+Index: b/qdvdauthor/main.cpp
3
+===================================================================
4
+--- a/qdvdauthor/main.cpp
5
++++ b/qdvdauthor/main.cpp
6
+@@ -39,11 +39,11 @@
7
+ 
8
+ void displayHelp ()
9
+ {
10
+   printf ("qdvdauthor -k -d -p -x -o -h\n"
11
+     "Copyrighted 2003-2007 by Varol Okan\n"
12
+-    "Built " __DATE__ "\n\n"
13
++    "Built in the Packman Buildservice\n\n"
14
+     "-k <inputFile>              This option allows you to import a kino smil file.\n"
15
+     "-d <inputFile>              This option allows you to import a dvdauthor.xml file.\n"
16
+     "-s <File1 File2 ... FileN>  This option allows you to import spumux.xml file(s).\n"
17
+     "-p <inputFile>              This option allows you to open a 'Q' DVD-Author project file.\n"
18
+     "-o <outputFile>             This option exports the generated 'Q' DVD-Author project file.\n"
19
+Index: b/addons/jhead/jhead.c
20
+===================================================================
21
+--- a/addons/jhead/jhead.c
22
++++ b/addons/jhead/jhead.c
23
+@@ -1442,11 +1442,11 @@ int main (int argc, char **argv)
24
+         }else if (!strcmp(arg,"-v")){
25
+             ShowTags = TRUE;
26
+         }else if (!strcmp(arg,"-q")){
27
+             Quiet = TRUE;
28
+         }else if (!strcmp(arg,"-V")){
29
+-            printf("Jhead version: "JHEAD_VERSION"   Compiled: "__DATE__"\n");
30
++            printf("Jhead version: "JHEAD_VERSION"\n");
31
+             exit(0);
32
+         }else if (!strcmp(arg,"-exifmap")){
33
+             DumpExifMap = TRUE;
34
+         }else if (!strcmp(arg,"-se")){
35
+             SupressNonFatalErrors = TRUE;
36
+Index: b/qdvdauthor/qdvdauthor.cpp
37
+===================================================================
38
+--- a/qdvdauthor/qdvdauthor.cpp
39
++++ b/qdvdauthor/qdvdauthor.cpp
40
+@@ -1517,11 +1517,11 @@ void QDVDAuthor::slotFeedback ()
41
+   qsBashScript += QString ("mplayer -vo help -ao help >> %1/system.txt\n").arg( qsFeedbackDir );
42
+   qsBashScript += QString ("echo PREFIX_DIRECTORY="PREFIX_DIRECTORY" >> %1/system.txt\n").arg( qsFeedbackDir );
43
+   qsBashScript += QString ("echo SYSTEM_DIRECTORY="SYSTEM_DIRECTORY" >> %1/system.txt\n").arg( qsFeedbackDir );
44
+   qsBashScript += QString ("echo Global::qsSystemPath="+ Global::qsSystemPath +" >> %1/system.txt\n").arg( qsFeedbackDir );
45
+   qsBashScript += QString ("echo \"QDVDAuthorVersionNumber="QDVDAUTHOR_VERSION_NUMBER"\" >> %1/system.txt\n").arg ( qsFeedbackDir );
46
+-  qsBashScript += QString ("echo \"Build ("__DATE__")\" >> %1/system.txt\n").arg ( qsFeedbackDir );
47
++//  qsBashScript += QString ("echo \"Build ("__DATE__")\" >> %1/system.txt\n").arg ( qsFeedbackDir );
48
+   qsBashScript += QString ("cd \"%1/%2/\"\n").arg(Global::qsTempPath).arg(Global::qsProjectName);
49
+   qsBashScript += QString ("cp \"%1/qrender/*.txt\" \"%2\"\n").arg ( Global::qsTempPath ).arg ( qsFeedbackDir );
50
+   qsBashScript += QString ("cp ~/.qdvdauthor/*.ini \"%1\"\n").arg( qsFeedbackDir );
51
+   qsBashScript += QString ("cp ~/.qdvdauthor/autosave.xml \"%1\"\n").arg( qsFeedbackDir );
52
+   qsBashScript += QString ("cp \"%1\" \"%2\" 2> /dev/null\n").arg(Global::qsProjectFileName).arg( qsFeedbackDir );
53
+@@ -2184,11 +2184,11 @@ void QDVDAuthor::helpAbout()
54
+   QString qsAbout;
55
+   qsAbout  = QString ("<h3><p align=\"center\">'Q' DVD-Author</p></h3>\n");
56
+   qsAbout += QString (          "<p align=\"center\">By<br>"             );
57
+   qsAbout += QString (             "<u>Varol Okan</u><br>"               );
58
+   qsAbout += QString (                     "<br>"                        );
59
+-  qsAbout += QString (             "Ver: %1 (build:%2)<br>"              ).arg(QDVDAUTHOR_VERSION_NUMBER).arg(__DATE__);
60
++  qsAbout += QString (             "Ver: %1<br>"              ).arg(QDVDAUTHOR_VERSION_NUMBER);
61
+   qsAbout += QString ("<a href=\"http://qdvdauthor.sourceforge.net\">http://qdvdauthor.sourceforge.net</a><br>");
62
+   qsAbout += QString ("System Folder at<br>%1/share/qdvdauthor/</p>").arg ( Global::qsSystemPath );
63
+   uiDialogAbout dialogAbout (this);
64
+   dialogAbout.m_pLabelAbout->setText ( qsAbout );
65
+   dialogAbout.exec();
66
+Index: b/qdvdauthor/qrender/qrender.cpp
67
+===================================================================
68
+--- a/qdvdauthor/qrender/qrender.cpp
69
++++ b/qdvdauthor/qrender/qrender.cpp
70
+@@ -303,11 +303,11 @@ void QRender::parseCommandLine (int argc
71
+       if ((strcmp(pCurrentArgument, "--help") == 0) || (strcmp(pCurrentArgument, "-H") == 0) )    {
72
+           usage ();
73
+           return;
74
+       }
75
+       if ((strcmp(pCurrentArgument, "--version") == 0) || (strcmp(pCurrentArgument, "-v") == 0) ) {
76
+-          printf ("Version: QRender %s built date %s http://qdvdauthor.sf.net\n", QRENDER_VERSION, __DATE__);
77
++          printf ("Version: QRender %s http://qdvdauthor.sf.net\n", QRENDER_VERSION);
78
+           return;
79
+       }
80
+       else if ((strcmp(pCurrentArgument, "--verbose") == 0) || (strcmp(pCurrentArgument, "-V") == 0) )    {
81
+           m_iVerbosityLevel = QString (argv++t).toInt();
82
+       }
83
+@@ -390,11 +390,11 @@ void QRender::readXml (QString qsXmlFile
84
+   m_xmlQRender.readXml (qsXmlFile);
85
+ }
86
+ 
87
+ void QRender::usage ()
88
+ {
89
+-  printf ("Version: QRender %s built date %s http://qdvdauthor.sf.net\n", QRENDER_VERSION,  __DATE__);
90
++  printf ("Version: QRender %s http://qdvdauthor.sf.net\n", QRENDER_VERSION);
91
+   printf ("Copyright: Copyright (C) 2005 Varol Okan\n\n");
92
+   
93
+   printf ("Usage: qrender  options ... -i file  options ... -i file ... options ... -o file\n\n");
94
+   
95
+   printf ("Options: \n\n");
96
+Index: b/qrender/parser.cpp
97
+===================================================================
98
+--- a/qrender/parser.cpp
99
++++ b/qrender/parser.cpp
100
+@@ -158,11 +158,11 @@ bool Parser::isTTY ( )
101
+   return m_bTTY;
102
+ }
103
+ 
104
+ void Parser::printHelp ( )
105
+ { //"it:o:p:"
106
+-  printf ( "QRender version %s, built date %s\n", QRENDER_VERSION, __DATE__ );
107
++  printf ( "QRender version %s\n", QRENDER_VERSION );
108
+   printf ( "Part of QDVDAuthor: http://qdvdauthor.sf.net\n\n" );
109
+ 
110
+   // NOt yet ... For a future release.
111
+   //  printf ( "qrender -hvt -p port -o FILE -ix|id FILE <... image files>\n" );
112
+   printf ( "qrender -hvt -p port -o FILE -ix FILE\n" );
113
+Index: b/qrender/render.cpp
114
+===================================================================
115
+--- a/qrender/render.cpp
116
++++ b/qrender/render.cpp
117
+@@ -85,11 +85,11 @@ Render::~Render ( )
118
+ void Render::run ( )
119
+ {
120
+   // Kick off the pinger ...
121
+   m_iTimerID = startTimer ( I_AM_ALIVE_INTERVAL );;
122
+ 
123
+-  logger ( ).iLOG ( "%s Build date : %s\n", QRENDER_VERSION, __DATE__ );
124
++  logger ( ).iLOG ( "%s\n", QRENDER_VERSION );
125
+   status ( ).log  ( "START\n" );
126
+ 
127
+   // Enter the TcpServers Event Loop to listen to events from the socket.
128
+   int iExec = -1;
129
+   while ( iExec != CLIENT_KILL_YOURSELF && ! m_bKillClient )  {
130
Refresh
Refresh
Request History
Stefan Seyfried's avatar

seife created request over 11 years ago

fix build on 12.1 and later, remove builddate


Stefan Seyfried's avatar

seife accepted request almost 13 years ago

fix build on 12.1 and later, remove builddate