Advertisement
sbaldovi

fuse_mime_03.diff

Feb 5th, 2012
122
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 23.31 KB | None | 0 0
  1. Index: configure.in
  2. ===================================================================
  3. --- configure.in    (revision 4662)
  4. +++ configure.in    (working copy)
  5. @@ -322,10 +322,11 @@
  6.  AC_TRY_COMPILE([#include <libspectrum.h>],[
  7.    int test = LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION;
  8.  ],
  9. -  AUTOLOAD_SNAPS=compressed; AC_MSG_RESULT(yes),
  10. -  AUTOLOAD_SNAPS=uncompressed; AC_MSG_RESULT(no))
  11. +  AUTOLOAD_SNAPS=compressed; LIBSPEC_HAVE_ZLIB=yes; AC_MSG_RESULT(yes),
  12. +  AUTOLOAD_SNAPS=uncompressed; LIBSPEC_HAVE_ZLIB=""; AC_MSG_RESULT(no))
  13.  CPPFLAGS="$ac_save_CPPFLAGS"
  14.  AC_SUBST(AUTOLOAD_SNAPS)
  15. +AC_SUBST(LIBSPEC_HAVE_ZLIB)
  16.  AC_LINK_FILES([
  17.     lib/"$AUTOLOAD_SNAPS"/disk_plus3.szx
  18.     lib/"$AUTOLOAD_SNAPS"/tape_128.szx
  19. @@ -356,6 +357,30 @@
  20.     lib/tape_se.szx
  21.     lib/tape_ts2068.szx])
  22.  
  23. +dnl Check if supplied libspectrum has support for bz2 compressed files
  24. +AC_MSG_CHECKING(whether libspectrum supports compressed bz2 files)
  25. +ac_save_CPPFLAGS="$CPPFLAGS"
  26. +CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
  27. +AC_TRY_COMPILE([#include <libspectrum.h>],[
  28. +  int test = LIBSPECTRUM_SUPPORTS_BZ2_COMPRESSION;
  29. +],
  30. +  LIBSPEC_HAVE_BZ2=yes; AC_MSG_RESULT(yes),
  31. +  LIBSPEC_HAVE_BZ2=""; AC_MSG_RESULT(no))
  32. +CPPFLAGS="$ac_save_CPPFLAGS"
  33. +AC_SUBST(LIBSPEC_HAVE_BZ2)
  34. +
  35. +dnl Check if supplied libspectrum has support for wav files
  36. +AC_MSG_CHECKING(whether libspectrum supports compressed bz2 files)
  37. +ac_save_CPPFLAGS="$CPPFLAGS"
  38. +CPPFLAGS="$CPPFLAGS $LIBSPEC_CFLAGS"
  39. +AC_TRY_COMPILE([#include <libspectrum.h>],[
  40. +  int test = LIBSPECTRUM_SUPPORTS_AUDIOFILE;
  41. +],
  42. +  LIBSPEC_HAVE_AUDIOFILE=yes; AC_MSG_RESULT(yes),
  43. +  LIBSPEC_HAVE_AUDIOFILE=""; AC_MSG_RESULT(no))
  44. +CPPFLAGS="$ac_save_CPPFLAGS"
  45. +AC_SUBST(LIBSPEC_HAVE_AUDIOFILE)
  46. +
  47.  dnl Check if a version of libpng which supplies png_write_png is available
  48.  AC_MSG_CHECKING(whether PNG support requested)
  49.  AC_ARG_WITH(png,
  50. @@ -681,6 +706,29 @@
  51.  AC_SUBST(COMPAT_SUBDIR)
  52.  AC_SUBST(COMPAT_OSNAME)
  53.  
  54. +dnl Decide if desktop and mime files are installed
  55. +AC_ARG_ENABLE(desktop-integration,
  56. +AS_HELP_STRING([--enable-desktop-integration], [add menu entry and file associations]),
  57. +if test "$enableval" = yes; then desktopintegration=yes; else desktopintegration=no; fi,
  58. +desktdesktopintegration=no)
  59. +AC_MSG_CHECKING(whether to install desktop file)
  60. +AC_MSG_RESULT($desktopintegration)
  61. +AM_CONDITIONAL(DESKTOP_INTEGRATION, test "$desktopintegration" = yes)
  62. +AC_CHECK_PROGS(GTK_UPDATE_ICON_CACHE,gtk-update-icon-cache,true)
  63. +
  64. +dnl Where to install the desktop and mime files
  65. +AC_ARG_WITH(desktop-dir,
  66. +AS_HELP_STRING([--with-desktop-dir=DIR], [location of desktop files (default=datadir)]),
  67. +if test "$withval" = no; then desktopdir=no; else desktopdir=yes; fi,
  68. +desktopdir=no)
  69. +if test "$desktopdir" = yes; then
  70. +  DESKTOP_DATADIR=$with_desktop_dir
  71. +else
  72. +  DESKTOP_DATADIR="$datadir"
  73. +fi
  74. +AM_CONDITIONAL(DESKTOP_DATADIR, test "$desktopdir" == yes)
  75. +AC_SUBST(DESKTOP_DATADIR)
  76. +
  77.  dnl Do we want the low memory compile?
  78.  AC_MSG_CHECKING(whether low memory compile requested)
  79.  AC_ARG_ENABLE(smallmem,
  80. @@ -723,6 +771,7 @@
  81.  compat/unix/Makefile \
  82.  compat/wii/Makefile \
  83.  compat/win32/Makefile \
  84. +data/Makefile \
  85.  debugger/Makefile \
  86.  hacking/Makefile \
  87.  lib/Makefile \
  88.  
  89. Property changes on: data
  90. ___________________________________________________________________
  91. Added: svn:ignore
  92.    + Makefile
  93. Makefile.in
  94. fuse.desktop
  95. fuse.xml
  96.  
  97.  
  98. Index: data/fuse.desktop.in
  99. ===================================================================
  100. --- data/fuse.desktop.in    (revision 0)
  101. +++ data/fuse.desktop.in    (revision 0)
  102. @@ -0,0 +1,10 @@
  103. +[Desktop Entry]
  104. +Version=1.0
  105. +Type=Application
  106. +Categories=Game;Emulator;GNOME;GTK;
  107. +Name=Fuse Spectrum Emulator
  108. +Comment=Emulator of the 1980s ZX Spectrum home computer and its various clones
  109. +MimeType=@MIME_TYPES@
  110. +Exec=fuse %f
  111. +Icon=fuse
  112. +
  113. Index: data/fuse.xml.in
  114. ===================================================================
  115. --- data/fuse.xml.in    (revision 0)
  116. +++ data/fuse.xml.in    (revision 0)
  117. @@ -0,0 +1,284 @@
  118. +<?xml version="1.0" encoding="UTF-8"?>
  119. +<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
  120. +  <mime-type type="audio/x-spectrum-csw">
  121. +    <comment>ZX Spectrum audio</comment>
  122. +    <magic>
  123. +      <match type="string" offset="0" value="Compressed Square Wave\x1a"/>
  124. +    </magic>
  125. +    <icon name="application-x-spectrum"/>
  126. +    <glob pattern="*.csw"/>
  127. +  </mime-type>
  128. +  <mime-type type="application/x-spectrum-dck">
  129. +    <comment>ZX Spectrum cartridge</comment>
  130. +    <icon name="application-x-spectrum"/>
  131. +    <glob pattern="*.dck"/>
  132. +  </mime-type>
  133. +  <mime-type type="application/x-spectrum-dsk">
  134. +    <comment>ZX Spectrum disk</comment>
  135. +    <magic>
  136. +      <match type="string" offset="0" value="MV - CPCEMU Disk-File\x0d\x0aDisk-Info\x0d\x0a"/>
  137. +      <match type="string" offset="0" value="EXTENDED CPC DSK File\x0d\x0aDisk-Info\x0d\x0a"/>
  138. +    </magic>
  139. +    <icon name="application-x-spectrum"/>
  140. +    <glob pattern="*.dsk"/>
  141. +  </mime-type>
  142. +  <mime-type type="application/x-spectrum-fdi">
  143. +    <comment>ZX Spectrum disk</comment>
  144. +    <magic>
  145. +      <match type="string" offset="0" value="FDI"/>
  146. +    </magic>
  147. +    <icon name="application-x-spectrum"/>
  148. +    <glob pattern="*.fdi"/>
  149. +  </mime-type>
  150. +  <mime-type type="application/x-spectrum-hdf">
  151. +    <comment>ZX Spectrum harddisk</comment>
  152. +    <magic>
  153. +      <match type="string" offset="0" value="RS-IDE\x1a"/>
  154. +    </magic>
  155. +    <icon name="application-x-spectrum"/>
  156. +    <glob pattern="*.hdf"/>
  157. +  </mime-type>
  158. +  <mime-type type="application/x-spectrum-img">
  159. +    <comment>ZX Spectrum disk</comment>
  160. +    <icon name="application-x-spectrum"/>
  161. +    <glob pattern="*.img"/>
  162. +  </mime-type>
  163. +  <mime-type type="application/x-spectrum-ltp">
  164. +    <comment>ZX Spectrum tape</comment>
  165. +    <icon name="application-x-spectrum"/>
  166. +    <glob pattern="*.ltp"/>
  167. +  </mime-type>
  168. +  <mime-type type="application/x-spectrum-mdr">
  169. +    <comment>ZX Spectrum microdrive</comment>
  170. +    <icon name="application-x-spectrum"/>
  171. +    <glob pattern="*.mdr"/>
  172. +  </mime-type>
  173. +  <mime-type type="application/x-spectrum-mgt">
  174. +    <comment>ZX Spectrum disk</comment>
  175. +    <icon name="application-x-spectrum"/>
  176. +    <glob pattern="*.mgt"/>
  177. +  </mime-type>
  178. +  <mime-type type="application/x-spectrum-mgtsnp">
  179. +    <comment>ZX Spectrum snapshot</comment>
  180. +    <icon name="application-x-spectrum"/>
  181. +    <glob pattern="*.mgtsnp"/>
  182. +  </mime-type>
  183. +  <mime-type type="application/x-spectrum-opd">
  184. +    <comment>ZX Spectrum disk</comment>
  185. +    <icon name="application-x-spectrum"/>
  186. +    <glob pattern="*.opd"/>
  187. +  </mime-type>
  188. +  <mime-type type="application/x-spectrum-opu">
  189. +    <comment>ZX Spectrum disk</comment>
  190. +    <icon name="application-x-spectrum"/>
  191. +    <glob pattern="*.opu"/>
  192. +  </mime-type>
  193. +  <mime-type type="application/x-spectrum-pzx">
  194. +    <comment>ZX Spectrum tape</comment>
  195. +    <magic>
  196. +      <match type="string" offset="0" value="PZXT"/>
  197. +    </magic>
  198. +    <icon name="application-x-spectrum"/>
  199. +    <glob pattern="*.pzx"/>
  200. +  </mime-type>
  201. +  <mime-type type="application/x-spectrum-raw">
  202. +    <comment>ZX Spectrum tape</comment>
  203. +    <magic>
  204. +      <match type="string" offset="0" value="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0Raw tape sample"/>
  205. +    </magic>
  206. +    <icon name="application-x-spectrum"/>
  207. +    <glob pattern="*.raw"/>
  208. +  </mime-type>
  209. +  <mime-type type="application/x-spectrum-rom">
  210. +    <comment>ZX Spectrum cartridge</comment>
  211. +    <icon name="application-x-spectrum"/>
  212. +    <glob pattern="*.rom"/>
  213. +  </mime-type>
  214. +  <mime-type type="application/x-spectrum-rzx">
  215. +    <comment>ZX Spectrum action replay</comment>
  216. +    <magic>
  217. +      <match type="string" offset="0" value="RZX!"/>
  218. +    </magic>
  219. +    <icon name="application-x-spectrum"/>
  220. +    <glob pattern="*.rzx"/>
  221. +  </mime-type>
  222. +  <mime-type type="application/x-spectrum-sad">
  223. +    <comment>ZX Spectrum disk</comment>
  224. +    <magic>
  225. +      <match type="string" offset="0" value="Aley's disk backup"/>
  226. +    </magic>
  227. +    <icon name="application-x-spectrum"/>
  228. +    <glob pattern="*.sad"/>
  229. +  </mime-type>
  230. +  <mime-type type="application/x-spectrum-scl">
  231. +    <comment>ZX Spectrum disk</comment>
  232. +    <magic>
  233. +      <match type="string" offset="0" value="SINCLAIR"/>
  234. +    </magic>
  235. +    <icon name="application-x-spectrum"/>
  236. +    <glob pattern="*.scl"/>
  237. +  </mime-type>
  238. +  <mime-type type="application/x-spectrum-slt">
  239. +    <comment>ZX Spectrum snapshot</comment>
  240. +    <icon name="application-x-spectrum"/>
  241. +    <glob pattern="*.slt"/>
  242. +  </mime-type>
  243. +  <mime-type type="application/x-spectrum-sna">
  244. +    <comment>ZX Spectrum snapshot</comment>
  245. +    <icon name="application-x-spectrum"/>
  246. +    <glob pattern="*.sna"/>
  247. +    <glob pattern="*.snapshot"/>
  248. +  </mime-type>
  249. +  <mime-type type="application/x-spectrum-snp">
  250. +    <comment>ZX Spectrum snapshot</comment>
  251. +    <icon name="application-x-spectrum"/>
  252. +    <glob pattern="*.snp"/>
  253. +  </mime-type>
  254. +  <mime-type type="application/x-spectrum-sp">
  255. +    <comment>ZX Spectrum snapshot</comment>
  256. +    <icon name="application-x-spectrum"/>
  257. +    <glob pattern="*.sp"/>
  258. +  </mime-type>
  259. +  <mime-type type="application/x-spectrum-spc">
  260. +    <comment>ZX Spectrum tape</comment>
  261. +    <icon name="application-x-spectrum"/>
  262. +    <glob pattern="*.spc"/>
  263. +  </mime-type>
  264. +  <mime-type type="application/x-spectrum-sta">
  265. +    <comment>ZX Spectrum tape</comment>
  266. +    <icon name="application-x-spectrum"/>
  267. +    <glob pattern="*.sta"/>
  268. +  </mime-type>
  269. +  <mime-type type="application/x-spectrum-szx">
  270. +    <comment>ZX Spectrum snapshot</comment>
  271. +    <magic>
  272. +      <match type="string" offset="0" value="ZXST"/>
  273. +    </magic>
  274. +    <icon name="application-x-spectrum"/>
  275. +    <glob pattern="*.szx"/>
  276. +    <glob pattern="*.zx-state"/>
  277. +  </mime-type>
  278. +  <mime-type type="application/x-spectrum-td0">
  279. +    <comment>ZX Spectrum disk</comment>
  280. +    <magic>
  281. +      <match type="string" offset="0" value="TD"/>
  282. +      <match type="string" offset="0" value="td"/>
  283. +    </magic>
  284. +    <icon name="application-x-spectrum"/>
  285. +    <glob pattern="*.td0"/>
  286. +  </mime-type>
  287. +  <mime-type type="application/x-spectrum-tap">
  288. +    <comment>ZX Spectrum tape</comment>
  289. +    <icon name="application-x-spectrum"/>
  290. +    <glob pattern="*.tap"/>
  291. +  </mime-type>
  292. +  <mime-type type="application/x-spectrum-trd">
  293. +    <comment>ZX Spectrum disk</comment>
  294. +    <magic>
  295. +      <match type="string" offset="0" value="SINCLAIR"/>
  296. +    </magic>
  297. +    <icon name="application-x-spectrum"/>
  298. +    <glob pattern="*.trd"/>
  299. +  </mime-type>
  300. +  <mime-type type="application/x-spectrum-tzx">
  301. +    <comment>ZX Spectrum tape</comment>
  302. +    <magic>
  303. +      <match type="string" offset="0" value="ZXTape!\x1a"/>
  304. +    </magic>
  305. +    <icon name="application-x-spectrum"/>
  306. +    <glob pattern="*.tzx"/>
  307. +  </mime-type>
  308. +  <mime-type type="application/x-spectrum-udi">
  309. +    <comment>ZX Spectrum disk</comment>
  310. +    <magic>
  311. +      <match type="string" offset="0" value="UDI!"/>
  312. +    </magic>
  313. +    <icon name="application-x-spectrum"/>
  314. +    <glob pattern="*.udi"/>
  315. +  </mime-type>
  316. +  <mime-type type="application/x-spectrum-z80">
  317. +    <comment>ZX Spectrum snapshot</comment>
  318. +    <icon name="application-x-spectrum"/>
  319. +    <glob pattern="*.z80"/>
  320. +  </mime-type>
  321. +  <mime-type type="application/x-spectrum-zxs">
  322. +    <comment>ZX Spectrum snapshot</comment>
  323. +    <magic>
  324. +      <match type="string" offset="0" value="SNAP"/>
  325. +    </magic>
  326. +    <icon name="application-x-spectrum"/>
  327. +    <glob pattern="*.zxs"/>
  328. +  </mime-type>
  329. +  ##LIBSPECTRUM_HAVE_AUDIOFILE_BEGIN##
  330. +  <mime-type type="audio/x-spectrum-wav">
  331. +    <comment>ZX Spectrum audio</comment>
  332. +    <magic priority="20">
  333. +      <match value="WAVE" type="string" offset="8"/>
  334. +      <match value="WAV " type="string" offset="8"/>
  335. +    </magic>
  336. +    <glob pattern="*.wav"/>
  337. +  </mime-type>
  338. +  ##LIBSPECTRUM_HAVE_AUDIOFILE_END##
  339. +  ##LIBSPECTRUM_HAVE_ZLIB_BEGIN##
  340. +  <mime-type type="application/x-spectrum-compressed">
  341. +    <comment>ZX Spectrum compressed</comment>
  342. +    <icon name="application-x-spectrum"/>
  343. +    <glob pattern="*.csw.gz"/>
  344. +    <glob pattern="*.dck.gz"/>
  345. +    <glob pattern="*.hdf.gz"/>
  346. +    <glob pattern="*.mdr.gz"/>
  347. +    <glob pattern="*.mgtsnp.gz"/>
  348. +    <glob pattern="*.ltp.gz"/>
  349. +    <glob pattern="*.pzx.gz"/>
  350. +    <glob pattern="*.raw.gz"/>
  351. +    <glob pattern="*.rom.gz"/>
  352. +    <glob pattern="*.rzx.gz"/>
  353. +    <glob pattern="*.slt.gz"/>
  354. +    <glob pattern="*.sna.gz"/>
  355. +    <glob pattern="*.snapshot.gz"/>
  356. +    <glob pattern="*.snp.gz"/>
  357. +    <glob pattern="*.sp.gz"/>
  358. +    <glob pattern="*.spc.gz"/>
  359. +    <glob pattern="*.sta.gz"/>
  360. +    <glob pattern="*.szx.gz"/>
  361. +    <glob pattern="*.tap.gz"/>
  362. +    <glob pattern="*.tzx.gz"/>
  363. +    ##LIBSPECTRUM_HAVE_AUDIOFILE_BEGIN##
  364. +    <glob pattern="*.wav.gz"/>
  365. +    ##LIBSPECTRUM_HAVE_AUDIOFILE_END##
  366. +    <glob pattern="*.z80.gz"/>
  367. +    <glob pattern="*.zxs.gz"/>
  368. +  </mime-type>
  369. +  ##LIBSPECTRUM_HAVE_ZLIB_END##
  370. +  ##LIBSPECTRUM_HAVE_BZ2_BEGIN##
  371. +  <mime-type type="application/x-spectrum-compressed-bz2">
  372. +    <comment>ZX Spectrum compressed</comment>
  373. +    <icon name="application-x-spectrum"/>
  374. +    <glob pattern="*.csw.bz2"/>
  375. +    <glob pattern="*.dck.bz2"/>
  376. +    <glob pattern="*.hdf.bz2"/>
  377. +    <glob pattern="*.mdr.bz2"/>
  378. +    <glob pattern="*.mgtsnp.bz2"/>
  379. +    <glob pattern="*.ltp.bz2"/>
  380. +    <glob pattern="*.pzx.bz2"/>
  381. +    <glob pattern="*.raw.bz2"/>
  382. +    <glob pattern="*.rom.bz2"/>
  383. +    <glob pattern="*.rzx.bz2"/>
  384. +    <glob pattern="*.slt.bz2"/>
  385. +    <glob pattern="*.sna.bz2"/>
  386. +    <glob pattern="*.snapshot.bz2"/>
  387. +    <glob pattern="*.snp.bz2"/>
  388. +    <glob pattern="*.sp.bz2"/>
  389. +    <glob pattern="*.spc.bz2"/>
  390. +    <glob pattern="*.sta.bz2"/>
  391. +    <glob pattern="*.szx.bz2"/>
  392. +    <glob pattern="*.tap.bz2"/>
  393. +    <glob pattern="*.tzx.bz2"/>
  394. +    ##LIBSPECTRUM_HAVE_AUDIOFILE_BEGIN##
  395. +    <glob pattern="*.wav.bz2"/>
  396. +    ##LIBSPECTRUM_HAVE_AUDIOFILE_END##
  397. +    <glob pattern="*.z80.bz2"/>
  398. +    <glob pattern="*.zxs.bz2"/>
  399. +  </mime-type>
  400. +  ##LIBSPECTRUM_HAVE_BZ2_END##
  401. +</mime-info>
  402. Index: data/Makefile.am
  403. ===================================================================
  404. --- data/Makefile.am    (revision 0)
  405. +++ data/Makefile.am    (revision 0)
  406. @@ -0,0 +1,116 @@
  407. +## Process this file with automake to produce Makefile.in
  408. +## Copyright (c) 2011 Philip Kendall
  409. +
  410. +## $Id$
  411. +
  412. +## This program is free software; you can redistribute it and/or modify
  413. +## it under the terms of the GNU General Public License as published by
  414. +## the Free Software Foundation; either version 2 of the License, or
  415. +## (at your option) any later version.
  416. +##
  417. +## This program is distributed in the hope that it will be useful,
  418. +## but WITHOUT ANY WARRANTY; without even the implied warranty of
  419. +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  420. +## GNU General Public License for more details.
  421. +##
  422. +## You should have received a copy of the GNU General Public License along
  423. +## with this program; if not, write to the Free Software Foundation, Inc.,
  424. +## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  425. +##
  426. +## Author contact information:
  427. +##
  428. +## E-mail: philip-fuse@shadowmagic.org.uk
  429. +
  430. +AUTOMAKE_OPTIONS = foreign
  431. +
  432. +if DESKTOP_INTEGRATION
  433. +
  434. +fusemimedir = $(DESKTOP_DATADIR)/mime/packages
  435. +fusemime_DATA = fuse.xml
  436. +
  437. +appdatadir = $(DESKTOP_DATADIR)/applications
  438. +appdata_DATA = fuse.desktop
  439. +
  440. +iconsdatadir = $(DESKTOP_DATADIR)/icons/hicolor
  441. +icons16dir = $(iconsdatadir)/16x16/apps
  442. +icons32dir = $(iconsdatadir)/32x32/apps
  443. +icons48dir = $(iconsdatadir)/48x48/apps
  444. +icons64dir = $(iconsdatadir)/64x64/apps
  445. +icons128dir = $(iconsdatadir)/128x128/apps
  446. +icons256dir = $(iconsdatadir)/256x256/apps
  447. +
  448. +dist_icons16_DATA = icons/16x16/fuse.png
  449. +dist_icons32_DATA = icons/32x32/fuse.png
  450. +dist_icons48_DATA = icons/48x48/fuse.png
  451. +dist_icons64_DATA = icons/64x64/fuse.png
  452. +dist_icons128_DATA = icons/128x128/fuse.png
  453. +dist_icons256_DATA = icons/256x256/fuse.png
  454. +
  455. +mimeicons16dir = $(iconsdatadir)/16x16/mimetypes
  456. +mimeicons32dir = $(iconsdatadir)/32x32/mimetypes
  457. +mimeicons48dir = $(iconsdatadir)/48x48/mimetypes
  458. +mimeicons64dir = $(iconsdatadir)/64x64/mimetypes
  459. +mimeicons128dir = $(iconsdatadir)/128x128/mimetypes
  460. +mimeicons256dir = $(iconsdatadir)/256x256/mimetypes
  461. +
  462. +dist_mimeicons16_DATA = icons/16x16/application-x-spectrum.png
  463. +dist_mimeicons32_DATA = icons/32x32/application-x-spectrum.png
  464. +dist_mimeicons48_DATA = icons/48x48/application-x-spectrum.png
  465. +dist_mimeicons64_DATA = icons/64x64/application-x-spectrum.png
  466. +dist_mimeicons128_DATA = icons/128x128/application-x-spectrum.png
  467. +dist_mimeicons256_DATA = icons/256x256/application-x-spectrum.png
  468. +
  469. +# Generate fuse.xml according to libspectrum capabilities
  470. +fuse.xml: fuse.xml.in
  471. +   if test -z "$(LIBSPEC_HAVE_AUDIOFILE)"; then \
  472. +     mime_audiofile='/LIBSPECTRUM_HAVE_AUDIOFILE_BEGIN/,/LIBSPECTRUM_HAVE_AUDIOFILE_END/d'; \
  473. +   else \
  474. +     mime_audiofile='/LIBSPECTRUM_HAVE_AUDIOFILE/d'; \
  475. +   fi; \
  476. +   if test -z "$(LIBSPEC_HAVE_ZLIB)"; then \
  477. +     mime_zlib='/LIBSPECTRUM_HAVE_ZLIB_BEGIN/,/LIBSPECTRUM_HAVE_ZLIB_END/d'; \
  478. +   else \
  479. +     mime_zlib='/LIBSPECTRUM_HAVE_ZLIB/d'; \
  480. +   fi; \
  481. +   if test -z "$(LIBSPEC_HAVE_BZ2)"; then \
  482. +     mime_bz2='/LIBSPECTRUM_HAVE_BZ2_BEGIN/,/LIBSPECTRUM_HAVE_BZ2_END/d'; \
  483. +   else \
  484. +     mime_bz2='/LIBSPECTRUM_HAVE_BZ2/d'; \
  485. +   fi; \
  486. +   $(SED) -e "$$mime_audiofile" -e "$$mime_zlib" -e "$$mime_bz2" < fuse.xml.in > $@
  487. +
  488. +# Generate fuse.desktop from fuse.xml to keep mime types list in sync
  489. +fuse.desktop: fuse.desktop.in $(srcdir)/fuse.xml
  490. +   list=`$(SED) -e '/<mime-type/ s/.*<mime-type type="\(.*\)">.*/;/' -e t -e d < $(srcdir)/fuse.xml | tr -d '\n'` && \
  491. +   $(SED) -e "s|@MIME_TYPES@|$$list|" < fuse.desktop.in > $@
  492. +
  493. +update-database-cache:
  494. +   if test -z "$(DESTDIR)"; then \
  495. +     update-desktop-database $(DESKTOP_DATADIR)/applications; \
  496. +     update-mime-database $(DESKTOP_DATADIR)/mime; \
  497. +     touch --no-create $(iconsdatadir); \
  498. +     $(GTK_UPDATE_ICON_CACHE) -t ${iconsdatadir}; \
  499. +   fi
  500. +
  501. +install-data-hook: update-database-cache
  502. +
  503. +uninstall-hook: update-database-cache
  504. +
  505. +validate: fuse.desktop
  506. +   ( dfvalidate=`which desktop-file-validate`; \
  507. +     if test x$$dfvalidate != x && test -x $$dfvalidate; then \
  508. +            $$dfvalidate $< || ( echo "* $< INVALID *"; exit 1 ) \
  509. +     fi )
  510. +
  511. +dist-hook: validate
  512. +
  513. +endif
  514. +
  515. +EXTRA_DIST = \
  516. +   fuse.desktop.in \
  517. +   fuse.xml.in
  518. +
  519. +CLEANFILES = \
  520. +   fuse.desktop \
  521. +   fuse.xml
  522. +
  523. Index: data/icons/48x48/fuse.png
  524. ===================================================================
  525. Cannot display: file marked as a binary type.
  526. svn:mime-type = application/octet-stream
  527.  
  528. Property changes on: data/icons/48x48/fuse.png
  529. ___________________________________________________________________
  530. Added: svn:mime-type
  531.    + application/octet-stream
  532.  
  533. Index: data/icons/48x48/application-x-spectrum.png
  534. ===================================================================
  535. Cannot display: file marked as a binary type.
  536. svn:mime-type = application/octet-stream
  537.  
  538. Property changes on: data/icons/48x48/application-x-spectrum.png
  539. ___________________________________________________________________
  540. Added: svn:mime-type
  541.    + application/octet-stream
  542.  
  543. Index: data/icons/32x32/fuse.png
  544. ===================================================================
  545. Cannot display: file marked as a binary type.
  546. svn:mime-type = application/octet-stream
  547.  
  548. Property changes on: data/icons/32x32/fuse.png
  549. ___________________________________________________________________
  550. Added: svn:mime-type
  551.    + application/octet-stream
  552.  
  553. Index: data/icons/32x32/application-x-spectrum.png
  554. ===================================================================
  555. Cannot display: file marked as a binary type.
  556. svn:mime-type = application/octet-stream
  557.  
  558. Property changes on: data/icons/32x32/application-x-spectrum.png
  559. ___________________________________________________________________
  560. Added: svn:mime-type
  561.    + application/octet-stream
  562.  
  563. Index: data/icons/256x256/fuse.png
  564. ===================================================================
  565. Cannot display: file marked as a binary type.
  566. svn:mime-type = application/octet-stream
  567.  
  568. Property changes on: data/icons/256x256/fuse.png
  569. ___________________________________________________________________
  570. Added: svn:mime-type
  571.    + application/octet-stream
  572.  
  573. Index: data/icons/256x256/application-x-spectrum.png
  574. ===================================================================
  575. Cannot display: file marked as a binary type.
  576. svn:mime-type = application/octet-stream
  577.  
  578. Property changes on: data/icons/256x256/application-x-spectrum.png
  579. ___________________________________________________________________
  580. Added: svn:mime-type
  581.    + application/octet-stream
  582.  
  583. Index: data/icons/16x16/fuse.png
  584. ===================================================================
  585. Cannot display: file marked as a binary type.
  586. svn:mime-type = application/octet-stream
  587.  
  588. Property changes on: data/icons/16x16/fuse.png
  589. ___________________________________________________________________
  590. Added: svn:mime-type
  591.    + application/octet-stream
  592.  
  593. Index: data/icons/16x16/application-x-spectrum.png
  594. ===================================================================
  595. Cannot display: file marked as a binary type.
  596. svn:mime-type = application/octet-stream
  597.  
  598. Property changes on: data/icons/16x16/application-x-spectrum.png
  599. ___________________________________________________________________
  600. Added: svn:mime-type
  601.    + application/octet-stream
  602.  
  603. Index: data/icons/64x64/fuse.png
  604. ===================================================================
  605. Cannot display: file marked as a binary type.
  606. svn:mime-type = application/octet-stream
  607.  
  608. Property changes on: data/icons/64x64/fuse.png
  609. ___________________________________________________________________
  610. Added: svn:mime-type
  611.    + application/octet-stream
  612.  
  613. Index: data/icons/64x64/application-x-spectrum.png
  614. ===================================================================
  615. Cannot display: file marked as a binary type.
  616. svn:mime-type = application/octet-stream
  617.  
  618. Property changes on: data/icons/64x64/application-x-spectrum.png
  619. ___________________________________________________________________
  620. Added: svn:mime-type
  621.    + application/octet-stream
  622.  
  623. Index: data/icons/128x128/fuse.png
  624. ===================================================================
  625. Cannot display: file marked as a binary type.
  626. svn:mime-type = application/octet-stream
  627.  
  628. Property changes on: data/icons/128x128/fuse.png
  629. ___________________________________________________________________
  630. Added: svn:mime-type
  631.    + application/octet-stream
  632.  
  633. Index: data/icons/128x128/application-x-spectrum.png
  634. ===================================================================
  635. Cannot display: file marked as a binary type.
  636. svn:mime-type = application/octet-stream
  637.  
  638. Property changes on: data/icons/128x128/application-x-spectrum.png
  639. ___________________________________________________________________
  640. Added: svn:mime-type
  641.    + application/octet-stream
  642.  
  643. Index: Makefile.am
  644. ===================================================================
  645. --- Makefile.am (revision 4662)
  646. +++ Makefile.am (working copy)
  647. @@ -26,6 +26,7 @@
  648.  bin_PROGRAMS = fuse
  649.  
  650.  SUBDIRS = @COMPAT_SUBDIR@ \
  651. +     data \
  652.       debugger \
  653.       hacking \
  654.       lib \
  655. @@ -41,7 +42,8 @@
  656.       unittests \
  657.       z80
  658.  
  659. -DIST_SUBDIRS = debugger \
  660. +DIST_SUBDIRS = data \
  661. +          debugger \
  662.            hacking \
  663.            lib \
  664.            machines \
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement